X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpixelformat.h;h=65331c99901fcd5aefee7b78e1fef5727579af9e;hb=24b24e2203c776aacd9744bb947f5cf47b03d328;hp=dde8594e723793a001c6166e575f18f8119aa86d;hpb=33b6ca811172d402fc891eeed9cd2a5edc28d61d;p=libs%2Fgl.git

diff --git a/source/core/pixelformat.h b/source/core/pixelformat.h
index dde8594e..65331c99 100644
--- a/source/core/pixelformat.h
+++ b/source/core/pixelformat.h
@@ -1,19 +1,8 @@
 #ifndef MSP_GL_PIXELFORMAT_H_
 #define MSP_GL_PIXELFORMAT_H_
 
-#include <msp/core/attributes.h>
 #include <msp/graphics/image.h>
 #include <msp/strings/lexicalcast.h>
-#include "gl.h"
-#include <msp/gl/extensions/arb_depth_buffer_float.h>
-#include <msp/gl/extensions/arb_depth_texture.h>
-#include <msp/gl/extensions/arb_texture_float.h>
-#include <msp/gl/extensions/arb_texture_rg.h>
-#include <msp/gl/extensions/ext_bgra.h>
-#include <msp/gl/extensions/ext_texture_srgb.h>
-#include <msp/gl/extensions/oes_required_internalformat.h>
-#include <msp/gl/extensions/oes_texture_stencil8.h>
-#include <msp/gl/extensions/msp_luminance_formats.h>
 #include "datatype.h"
 
 namespace Msp {
@@ -64,6 +53,7 @@ inadvisable for programs to rely on it.
 */
 enum PixelFormat
 {
+	NO_PIXELFORMAT = 0,
 	R8 = 0x4100|RED,
 	R16F = 0x3200|RED,
 	R32F = 0x3400|RED,
@@ -95,7 +85,7 @@ void operator>>(const LexicalConverter &, PixelComponents &);
 void operator>>(const LexicalConverter &, PixelFormat &);
 
 PixelComponents components_from_graphics(Graphics::PixelFormat);
-PixelFormat pixelformat_from_image(const Graphics::Image &);
+PixelFormat pixelformat_from_image(const Graphics::Image &, bool = false);
 
 PixelFormat make_pixelformat(PixelComponents, DataType, bool = false);
 inline PixelComponents get_components(PixelFormat f) { return static_cast<PixelComponents>(f&0xFF); }
@@ -108,8 +98,8 @@ inline unsigned get_pixel_size(PixelFormat f) { return get_component_count(f)*ge
 
 void require_pixelformat(PixelFormat);
 
-GLenum get_gl_components(PixelComponents);
-GLenum get_gl_pixelformat(PixelFormat);
+unsigned get_gl_components(PixelComponents);
+unsigned get_gl_pixelformat(PixelFormat);
 
 } // namespace GL
 } // namespace Msp