X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=0fa6609a1ead97d061ad7f45c9e2a97ff0c805ba;hb=8dbd6316d277d2f9cbf85e7e61f2541421e01292;hp=c232da1e5876f838cd6db34b9ad496adfb3ae113;hpb=055f553b1a75f44e72f3c2b5a1c98c1e1e8f3f30;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index c232da1e..0fa6609a 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -6,37 +6,44 @@
 #include "gl.h"
 #include <msp/gl/extensions/arb_texture_float.h>
 #include <msp/gl/extensions/ext_bgra.h>
+#include <msp/gl/extensions/ext_texture_srgb.h>
+#include <msp/gl/extensions/msp_legacy_features.h>
+#include <msp/gl/extensions/msp_sized_internal_formats.h>
 
 namespace Msp {
 namespace GL {
 
 enum PixelFormat
 {
-	COLOR_INDEX     = GL_COLOR_INDEX,
 	STENCIL_INDEX   = GL_STENCIL_INDEX,
 	DEPTH_COMPONENT = GL_DEPTH_COMPONENT,
-	RED             = GL_RED,
-	GREEN           = GL_GREEN,
-	BLUE            = GL_BLUE,
-	ALPHA           = GL_ALPHA,
 	RGB             = GL_RGB,
 	RGBA            = GL_RGBA,
 	RGB8            = GL_RGB8,
-	RGB16F          = GL_RGB16F_ARB,
-	RGB32F          = GL_RGB32F_ARB,
+	RGB16F          = GL_RGB16F,
+	RGB32F          = GL_RGB32F,
 	RGBA8           = GL_RGBA8,
-	RGBA16F         = GL_RGBA16F_ARB,
-	RGBA32F         = GL_RGBA32F_ARB,
+	RGBA16F         = GL_RGBA16F,
+	RGBA32F         = GL_RGBA32F,
+	SRGB            = GL_SRGB,
+	SRGB_ALPHA      = GL_SRGB_ALPHA,
+	SRGB8           = GL_SRGB8,
+	SRGB8_ALPHA8    = GL_SRGB8_ALPHA8,
 	BGR             = GL_BGR,
 	BGRA            = GL_BGRA,
 	LUMINANCE       = GL_LUMINANCE,
 	LUMINANCE8      = GL_LUMINANCE8,
+	// TODO Remove LUMINANCE(_ALPHA) float formats once ARB_texture_rg becomes supported
 	LUMINANCE16F    = GL_LUMINANCE16F_ARB,
 	LUMINANCE32F    = GL_LUMINANCE32F_ARB,
 	LUMINANCE_ALPHA    = GL_LUMINANCE_ALPHA,
 	LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8,
 	LUMINANCE_ALPHA16F = GL_LUMINANCE_ALPHA16F_ARB,
-	LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB
+	LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB,
+	SLUMINANCE         = GL_SLUMINANCE,
+	SLUMINANCE8        = GL_SLUMINANCE8,
+	SLUMINANCE_ALPHA   = GL_SLUMINANCE_ALPHA,
+	SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8
 };
 
 void operator>>(const LexicalConverter &, PixelFormat &);
@@ -45,7 +52,10 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
 PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat);
 
 PixelFormat get_base_pixelformat(PixelFormat);
+PixelFormat get_srgb_pixelformat(PixelFormat);
 unsigned get_component_count(PixelFormat);
+unsigned get_component_size(PixelFormat);
+unsigned get_pixel_size(PixelFormat);
 
 void require_pixelformat(PixelFormat);