X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fpixelformat.h;h=2db894a78447ed0d6b7b2892f7c5e8a499509774;hp=4e71b9f0e7f4c1a1069f284a8f420b266f98288b;hb=6b0a93110454cc8d84d0d9b9b29fe9d0ecbaa4d5;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 4e71b9f0..2db894a7 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -1,48 +1,82 @@
 #ifndef MSP_GL_PIXELFORMAT_H_
 #define MSP_GL_PIXELFORMAT_H_
 
-#include <istream>
-#include <msp/gbase/pixelformat.h>
+#include <msp/graphics/pixelformat.h>
+#include <msp/strings/lexicalcast.h>
 #include "gl.h"
-#include <GL/glext.h>
+#include <msp/gl/extensions/arb_depth_buffer_float.h>
+#include <msp/gl/extensions/arb_depth_texture.h>
+#include <msp/gl/extensions/arb_texture_float.h>
+#include <msp/gl/extensions/arb_texture_rg.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/oes_required_internalformat.h>
+#include <msp/gl/extensions/oes_texture_stencil8.h>
 
 namespace Msp {
 namespace GL {
 
 enum PixelFormat
 {
-	COLOR_INDEX     = GL_COLOR_INDEX,
 	STENCIL_INDEX   = GL_STENCIL_INDEX,
 	DEPTH_COMPONENT = GL_DEPTH_COMPONENT,
+	DEPTH_COMPONENT16 = GL_DEPTH_COMPONENT16,
+	DEPTH_COMPONENT24 = GL_DEPTH_COMPONENT24,
+	DEPTH_COMPONENT32 = GL_DEPTH_COMPONENT32,
+	DEPTH_COMPONENT32F = GL_DEPTH_COMPONENT32F,
 	RED             = GL_RED,
-	GREEN           = GL_GREEN,
-	BLUE            = GL_BLUE,
-	ALPHA           = GL_ALPHA,
+	RG              = GL_RG,
 	RGB             = GL_RGB,
 	RGBA            = GL_RGBA,
+	R8              = GL_R8,
+	R16F            = GL_R16F,
+	R32F            = GL_R32F,
+	RG8             = GL_RG8,
+	RG16F           = GL_RG16F,
+	RG32F           = GL_RG32F,
 	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,
-	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,
+	LUMINANCE8_ALPHA8  = GL_LUMINANCE8_ALPHA8,
+
+	// Deprecated
+	SLUMINANCE         = GL_SLUMINANCE,
+	SLUMINANCE8        = GL_SLUMINANCE8,
+	SLUMINANCE_ALPHA   = GL_SLUMINANCE_ALPHA,
+	SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8,
+
+	// Typo, deprecated
+	LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8
 };
 
-std::istream &operator>>(std::istream &, PixelFormat &);
+void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat, bool = false);
 
 PixelFormat get_base_pixelformat(PixelFormat);
+PixelFormat get_unsized_pixelformat(PixelFormat);
+PixelFormat get_sized_pixelformat(PixelFormat, unsigned = 1);
+PixelFormat get_default_sized_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