Deal with nontrivial image configurations

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

diff --git a/source/pixelformat.h b/source/pixelformat.h
index dfe632b6c5f184870e9773dd5fad00b84af4ace1..c232da1e5876f838cd6db34b9ad496adfb3ae113 100644 (file)
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -4,7 +4,8 @@
 #include <msp/graphics/pixelformat.h>
 #include <msp/strings/lexicalcast.h>
 #include "gl.h"
-#include <GL/glext.h>
+#include <msp/gl/extensions/arb_texture_float.h>
+#include <msp/gl/extensions/ext_bgra.h>
 
 namespace Msp {
 namespace GL {
@@ -35,14 +36,18 @@ enum PixelFormat
        LUMINANCE_ALPHA    = GL_LUMINANCE_ALPHA,
        LUMINANCE_ALPHA8   = GL_LUMINANCE8_ALPHA8,
        LUMINANCE_ALPHA16F = GL_LUMINANCE_ALPHA16F_ARB,
-       LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB,
+       LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB
 };
 
 void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelFormat pixelformat_from_graphics(Graphics::PixelFormat);
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat);
 
 PixelFormat get_base_pixelformat(PixelFormat);
+unsigned get_component_count(PixelFormat);
+
+void require_pixelformat(PixelFormat);
 
 } // namespace GL
 } // namespace Msp