X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=377335f25fd901900046cf703cf97b9b6ac865ab;hb=ed7ca8892daceebb963950945fed5e75bd96a8a1;hp=5d59c255ea2c40e42aa2a9e20240e47607c22201;hpb=e19309340e90ee881e9cb2f8b7c33a5b89681aa6;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 5d59c255..377335f2 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -10,7 +10,6 @@
 #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>
 
@@ -48,18 +47,7 @@ enum PixelFormat
 	BGR             = GL_BGR,
 	BGRA            = GL_BGRA,
 	LUMINANCE       = GL_LUMINANCE,
-	LUMINANCE8      = GL_LUMINANCE8,
-	LUMINANCE_ALPHA    = GL_LUMINANCE_ALPHA,
-	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
+	LUMINANCE_ALPHA = GL_LUMINANCE_ALPHA
 };
 
 void operator>>(const LexicalConverter &, PixelFormat &);
@@ -70,6 +58,7 @@ PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat, bool = fals
 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);