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

diff --git a/source/pixelformat.h b/source/pixelformat.h
index a0e578a6..7a562cc9 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -7,6 +7,8 @@
 #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 {
@@ -18,35 +20,36 @@ enum PixelFormat
 	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,
-	SRGB            = GL_SRGB_EXT,
-	SRGB_ALPHA      = GL_SRGB_ALPHA_EXT,
-	SRGB8           = GL_SRGB8_EXT,
-	SRGB8_ALPHA8    = GL_SRGB8_ALPHA8_EXT,
+	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,
-	SLUMINANCE         = GL_SLUMINANCE_EXT,
-	SLUMINANCE8        = GL_SLUMINANCE8_EXT,
-	SLUMINANCE_ALPHA   = GL_SLUMINANCE_ALPHA_EXT,
-	SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8_EXT
+	SLUMINANCE         = GL_SLUMINANCE,
+	SLUMINANCE8        = GL_SLUMINANCE8,
+	SLUMINANCE_ALPHA   = GL_SLUMINANCE_ALPHA,
+	SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8
 };
 
 void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
-PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat);
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat, bool = false);
 
 PixelFormat get_base_pixelformat(PixelFormat);
 PixelFormat get_srgb_pixelformat(PixelFormat);