X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=eca0b0e5833970f858f64e08e5c7061b0a9cd3e0;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=17a90d365781095f650109457ec6673506522ac1;hpb=b1c758a602262afad23e28ab68d62021a5b1257e;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 17a90d36..eca0b0e5 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -4,13 +4,14 @@
 #include <msp/graphics/pixelformat.h>
 #include <msp/strings/lexicalcast.h>
 #include "gl.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/msp_sized_internal_formats.h>
+#include <msp/gl/extensions/oes_required_internalformat.h>
+#include <msp/gl/extensions/oes_texture_stencil8.h>
 
 namespace Msp {
 namespace GL {
@@ -22,6 +23,7 @@ enum PixelFormat
 	DEPTH_COMPONENT16 = GL_DEPTH_COMPONENT16,
 	DEPTH_COMPONENT24 = GL_DEPTH_COMPONENT24,
 	DEPTH_COMPONENT32 = GL_DEPTH_COMPONENT32,
+	DEPTH_COMPONENT32F = GL_DEPTH_COMPONENT32F,
 	RED             = GL_RED,
 	RG              = GL_RG,
 	RGB             = GL_RGB,
@@ -47,14 +49,7 @@ enum PixelFormat
 	LUMINANCE       = GL_LUMINANCE,
 	LUMINANCE8      = GL_LUMINANCE8,
 	LUMINANCE_ALPHA    = GL_LUMINANCE_ALPHA,
-	LUMINANCE8_ALPHA8  = GL_LUMINANCE8_ALPHA8,
-	SLUMINANCE         = GL_SLUMINANCE,
-	SLUMINANCE8        = GL_SLUMINANCE8,
-	SLUMINANCE_ALPHA   = GL_SLUMINANCE_ALPHA,
-	SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8,
-
-	// Typo, deprecated
-	LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8
+	LUMINANCE8_ALPHA8  = GL_LUMINANCE8_ALPHA8
 };
 
 void operator>>(const LexicalConverter &, PixelFormat &);
@@ -63,7 +58,9 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
 PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat, bool = false);
 
 PixelFormat get_base_pixelformat(PixelFormat);
-PixelFormat get_sized_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);