X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=55115cf77e7bbde4a2ac3af6f92d42ae7fcd9edb;hb=dd32f2502f8d090c639df4a34d56d21ccbecac83;hp=ef373b86ba467ef2132f0aad2a8adf18fe1b769a;hpb=119d9819ac9e9a8d274d2410beffe54e470485a3;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index ef373b86..55115cf7 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -1,15 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #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>
 
@@ -40,15 +33,19 @@ enum PixelFormat
 	LUMINANCE16F    = GL_LUMINANCE16F_ARB,
 	LUMINANCE32F    = GL_LUMINANCE32F_ARB,
 	LUMINANCE_ALPHA    = GL_LUMINANCE_ALPHA,
-	LUMINANCE_ALPHA8   = GL_LUMINANCE_ALPHA8,
+	LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8,
 	LUMINANCE_ALPHA16F = GL_LUMINANCE_ALPHA16F_ARB,
-	LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB,
+	LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB
 };
 
-std::istream &operator>>(std::istream &, PixelFormat &);
+void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
 
+PixelFormat get_base_pixelformat(PixelFormat);
+
+void require_pixelformat(PixelFormat);
+
 } // namespace GL
 } // namespace Msp