X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=43330f07dcfe1249f66794913eb577abd68a4e3a;hb=9cf5d10abe5bdff0708c41544f6e8b15aca5151f;hp=d61788a630ecb702359605afb8b23ba42bf60c78;hpb=a5797c9babd17673285b3b15c7572c2d8fe1595c;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index d61788a6..43330f07 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"
 
 namespace Msp {
@@ -26,16 +19,32 @@ enum PixelFormat
 	ALPHA           = GL_ALPHA,
 	RGB             = GL_RGB,
 	RGBA            = GL_RGBA,
+	RGB8            = GL_RGB8,
+	RGB16F          = GL_RGB16F_ARB,
+	RGB32F          = GL_RGB32F_ARB,
+	RGBA8           = GL_RGBA8,
+	RGBA16F         = GL_RGBA16F_ARB,
+	RGBA32F         = GL_RGBA32F_ARB,
 	BGR             = GL_BGR,
 	BGRA            = GL_BGRA,
 	LUMINANCE       = GL_LUMINANCE,
-	LUMINANCE_ALPHA = GL_LUMINANCE_ALPHA
+	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
 };
 
-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