X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=6063145ad859c042eb5070c5ae787ad94d904d87;hb=e17243fb2421977cb781361828b77718e2cf8d48;hp=87cbe7546c95a8ca0125c1ef5fbb784139d10f27;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 87cbe754..6063145a 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -8,7 +8,10 @@ Distributed under the LGPL
 #ifndef MSP_GL_PIXELFORMAT_H_
 #define MSP_GL_PIXELFORMAT_H_
 
-#include <GL/gl.h>
+#include <istream>
+#include <msp/gbase/pixelformat.h>
+#include "gl.h"
+#include <GL/glext.h>
 
 namespace Msp {
 namespace GL {
@@ -24,12 +27,28 @@ 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 &);
+
+PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
+
 } // namespace GL
 } // namespace Msp