X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fpixelformat.h;h=13bc03a8c059325d7272120f5a486b58e7e5d01e;hp=5a5302cd648fbe0a47f3d44e1450d2187b7a1a72;hb=HEAD;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3

diff --git a/source/core/pixelformat.h b/source/core/pixelformat.h
index 5a5302cd..13bc03a8 100644
--- a/source/core/pixelformat.h
+++ b/source/core/pixelformat.h
@@ -3,15 +3,15 @@
 
 #include <msp/graphics/image.h>
 #include <msp/strings/lexicalcast.h>
-#include "gl.h"
 #include "datatype.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-Identifies the components of a pixel, without type information.  The values
-are bitfields laid as follows:
+Identifies the components of a pixel, without type information.
+
+The values are bitfields laid as follows:
 
 _grs dccc
  │││ │  └╴Number of components
@@ -21,7 +21,7 @@ _grs dccc
  └───────╴Grayscale flag
 
 This information is presented for internal documentation purposes only; it is
-inadvisable for programs to rely on it.
+inadvisable for applications to rely on it.
 */
 enum PixelComponents
 {
@@ -38,8 +38,21 @@ enum PixelComponents
 };
 
 /**
-Identifies a pixel format, with components and type.  The values are bitfields
-laid as follows:
+Describes a mapping from one set of components to another.
+*/
+enum ComponentSwizzle
+{
+	NO_SWIZZLE,
+	R_TO_LUMINANCE,
+	RG_TO_LUMINANCE_ALPHA,
+	RGB_TO_BGR,
+	RGBA_TO_RGB
+};
+
+/**
+Identifies a pixel format, with components and type.
+
+The values are bitfields laid as follows:
 
 tnfg ssss cccc cccc
 ││││    │         └╴Components (see PixelComponents)
@@ -50,10 +63,11 @@ tnfg ssss cccc cccc
 └──────────────────╴sRGB flag
 
 This information is presented for internal documentation purposes only; it is
-inadvisable for programs to rely on it.
+inadvisable for applications to rely on it.
 */
 enum PixelFormat
 {
+	NO_PIXELFORMAT = 0,
 	R8 = 0x4100|RED,
 	R16F = 0x3200|RED,
 	R32F = 0x3400|RED,
@@ -85,7 +99,11 @@ 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);
+
+ComponentSwizzle get_required_swizzle(PixelComponents);
+PixelComponents swizzle_components(PixelComponents, ComponentSwizzle);
+PixelComponents unswizzle_components(PixelComponents, ComponentSwizzle);
 
 PixelFormat make_pixelformat(PixelComponents, DataType, bool = false);
 inline PixelComponents get_components(PixelFormat f) { return static_cast<PixelComponents>(f&0xFF); }
@@ -98,10 +116,9 @@ 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);
-
 } // namespace GL
 } // namespace Msp
 
+#include "pixelformat_backend.h"
+
 #endif