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

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 6980ec8a..ef373b86 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -9,7 +9,9 @@ Distributed under the LGPL
 #define MSP_GL_PIXELFORMAT_H_
 
 #include <istream>
+#include <msp/gbase/pixelformat.h>
 #include "gl.h"
+#include <GL/glext.h>
 
 namespace Msp {
 namespace GL {
@@ -25,14 +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_LUMINANCE_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