X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.cpp;h=cd3bb2aa78e30709293dd8dfb13f4d42cd4c481d;hb=f1b12c992db974c679d85ae6ec22cd318199d0d5;hp=027ae88c7fe1bb7c5e11290ef5133e3c143b8d05;hpb=5a93cc603eef43617a10b76bc9c19a3272ac1d49;p=libs%2Fgl.git

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index 027ae88c..cd3bb2aa 100644
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -10,20 +10,10 @@ namespace GL {
 
 void operator>>(const LexicalConverter &conv, PixelFormat &fmt)
 {
-	if(conv.get()=="COLOR_INDEX")
-		fmt = COLOR_INDEX;
-	else if(conv.get()=="STENCIL_INDEX")
+	if(conv.get()=="STENCIL_INDEX")
 		fmt = STENCIL_INDEX;
 	else if(conv.get()=="DEPTH_COMPONENT")
 		fmt = DEPTH_COMPONENT;
-	else if(conv.get()=="RED")
-		fmt = RED;
-	else if(conv.get()=="GREEN")
-		fmt = GREEN;
-	else if(conv.get()=="BLUE")
-		fmt = BLUE;
-	else if(conv.get()=="ALPHA")
-		fmt = ALPHA;
 	else if(conv.get()=="RGB")
 		fmt = RGB;
 	else if(conv.get()=="RGBA")
@@ -52,7 +42,6 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat pf)
 {
 	switch(pf)
 	{
-	case Graphics::COLOR_INDEX: return COLOR_INDEX;
 	case Graphics::LUMINANCE: return LUMINANCE;
 	case Graphics::LUMINANCE_ALPHA: return LUMINANCE_ALPHA;
 	case Graphics::RGB: return RGB;
@@ -105,16 +94,28 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
 	}
 }
 
+PixelFormat get_srgb_pixelformat(PixelFormat pf)
+{
+	switch(pf)
+	{
+	case RGB: return SRGB;
+	case RGBA: return SRGB_ALPHA;
+	case RGB8: return SRGB8;
+	case RGBA8: return SRGB8_ALPHA8;
+	case LUMINANCE: return SLUMINANCE;
+	case LUMINANCE8: return SLUMINANCE8;
+	case LUMINANCE_ALPHA: return SLUMINANCE_ALPHA;
+	case LUMINANCE_ALPHA8: return SLUMINANCE8_ALPHA8;
+	default: return 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:
 	case SLUMINANCE:
 		return 1;
@@ -128,10 +129,34 @@ unsigned get_component_count(PixelFormat pf)
 	case BGRA:
 		return 4;
 	default:
-		throw invalid_argument("get_pixelformat_component_count");
+		throw invalid_argument("get_component_count");
+	}
+}
+
+unsigned get_component_size(PixelFormat pf)
+{
+	switch(pf)
+	{
+	case RGB16F:
+	case RGBA16F:
+	case LUMINANCE16F:
+	case LUMINANCE_ALPHA16F:
+		return 2;
+	case RGB32F:
+	case RGBA32F:
+	case LUMINANCE32F:
+	case LUMINANCE_ALPHA32F:
+		return 4;
+	default:
+		return 1;
 	}
 }
 
+unsigned get_pixel_size(PixelFormat pf)
+{
+	return get_component_count(pf)*get_component_size(pf);
+}
+
 void require_pixelformat(PixelFormat pf)
 {
 	switch(pf)