Drop Id tags and copyright notices from files

[libs/gl.git] / source / pixelformat.h

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 87cbe7546c95a8ca0125c1ef5fbb784139d10f27..4e71b9f0e7f4c1a1069f284a8f420b266f98288b 100644 (file)
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -1,14 +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 <GL/gl.h>
+#include <istream>
+#include <msp/gbase/pixelformat.h>
+#include "gl.h"
+#include <GL/glext.h>
 
 namespace Msp {
 namespace GL {
@@ -24,12 +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