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

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 6980ec8a..4e71b9f0 100644
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -1,15 +1,10 @@
-/* $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 "gl.h"
+#include <GL/glext.h>
 
 namespace Msp {
 namespace GL {
@@ -25,14 +20,30 @@ 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);
+
+PixelFormat get_base_pixelformat(PixelFormat);
+
 } // namespace GL
 } // namespace Msp