X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=01f626c43882bc192b00e83051b9c7c723fcf07c;hb=5a93cc603eef43617a10b76bc9c19a3272ac1d49;hp=43330f07dcfe1249f66794913eb577abd68a4e3a;hpb=9cf5d10abe5bdff0708c41544f6e8b15aca5151f;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 43330f07..01f626c4 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -4,6 +4,9 @@
 #include <msp/graphics/pixelformat.h>
 #include <msp/strings/lexicalcast.h>
 #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>
 
 namespace Msp {
 namespace GL {
@@ -25,6 +28,10 @@ enum PixelFormat
 	RGBA8           = GL_RGBA8,
 	RGBA16F         = GL_RGBA16F_ARB,
 	RGBA32F         = GL_RGBA32F_ARB,
+	SRGB            = GL_SRGB_EXT,
+	SRGB_ALPHA      = GL_SRGB_ALPHA_EXT,
+	SRGB8           = GL_SRGB8_EXT,
+	SRGB8_ALPHA8    = GL_SRGB8_ALPHA8_EXT,
 	BGR             = GL_BGR,
 	BGRA            = GL_BGRA,
 	LUMINANCE       = GL_LUMINANCE,
@@ -34,14 +41,20 @@ enum PixelFormat
 	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_EXT,
+	SLUMINANCE8        = GL_SLUMINANCE8_EXT,
+	SLUMINANCE_ALPHA   = GL_SLUMINANCE_ALPHA_EXT,
+	SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8_EXT
 };
 
 void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat);
 
 PixelFormat get_base_pixelformat(PixelFormat);
+unsigned get_component_count(PixelFormat);
 
 void require_pixelformat(PixelFormat);