X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.cpp;h=26600b33661fca3c7e73729702278f0aa4664feb;hb=61ff840cd211f10d45dca8c4dad2cca5f68aaa42;hp=4b3dade14e4a9eef0b1052d4764c8e0c4c2b8a51;hpb=41b4cb3002f3551ce1bd6fdf15994ee7bc523788;p=libs%2Fgl.git

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index 4b3dade1..26600b33 100644
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -1,6 +1,6 @@
+#include <msp/gl/extensions/arb_texture_float.h>
+#include <msp/gl/extensions/ext_bgra.h>
 #include <msp/strings/format.h>
-#include "arb_texture_float.h"
-#include "ext_bgra.h"
 #include "pixelformat.h"
 
 using namespace std;
@@ -48,13 +48,27 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat pf)
 	case Graphics::LUMINANCE: return LUMINANCE;
 	case Graphics::LUMINANCE_ALPHA: return LUMINANCE_ALPHA;
 	case Graphics::RGB: return RGB;
+	case Graphics::RGBX:
 	case Graphics::RGBA: return RGBA;
 	case Graphics::BGR: return BGR;
+	case Graphics::BGRX:
 	case Graphics::BGRA: return BGRA;
 	default: throw invalid_argument("pixelformat_from_graphics");
 	}
 }
 
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat pf)
+{
+	switch(pf)
+	{
+	case Graphics::RGBX:
+	case Graphics::BGR:
+	case Graphics::BGRX: return RGB;
+	case Graphics::BGRA: return RGBA;
+	default: return pixelformat_from_graphics(pf);
+	}
+}
+
 PixelFormat get_base_pixelformat(PixelFormat pf)
 {
 	switch(pf)
@@ -75,6 +89,31 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
 	}
 }
 
+unsigned get_component_count(PixelFormat pf)
+{
+	switch(get_base_pixelformat(pf))
+	{
+	case COLOR_INDEX:
+	case STENCIL_INDEX:
+	case DEPTH_COMPONENT:
+	case RED:
+	case GREEN:
+	case BLUE:
+	case LUMINANCE:
+		return 1;
+	case LUMINANCE_ALPHA:
+		return 2;
+	case RGB:
+	case BGR:
+		return 3;
+	case RGBA:
+	case BGRA:
+		return 4;
+	default:
+		throw invalid_argument("get_pixelformat_component_count");
+	}
+}
+
 void require_pixelformat(PixelFormat pf)
 {
 	switch(pf)