X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=a0e578a6a65443dab00fd69007f669ac1d546730;hb=f1b12c992db974c679d85ae6ec22cd318199d0d5;hp=d98b45f889e7df666ef2e87e9f56a4091fc412d4;hpb=48d253c9f19c04c6940bfc932a78c51ea24e2e75;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index d98b45f8..a0e578a6 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -1,23 +1,20 @@
 #ifndef MSP_GL_PIXELFORMAT_H_
 #define MSP_GL_PIXELFORMAT_H_
 
-#include <istream>
 #include <msp/graphics/pixelformat.h>
+#include <msp/strings/lexicalcast.h>
 #include "gl.h"
-#include <GL/glext.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 {
 
 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,
@@ -26,6 +23,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,
@@ -36,13 +37,24 @@ enum PixelFormat
 	LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8,
 	LUMINANCE_ALPHA16F = GL_LUMINANCE_ALPHA16F_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
 };
 
-std::istream &operator>>(std::istream &, PixelFormat &);
+void operator>>(const LexicalConverter &, PixelFormat &);
 
 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);
 
 } // namespace GL
 } // namespace Msp