X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.cpp;h=ac2b1ea73dfde7818fab470b45565e1c5f5e32a2;hb=b1c758a602262afad23e28ab68d62021a5b1257e;hp=99f15307d1304bf41c36c80aa7af825fd41a7171;hpb=0221e39a685c4f3122a0fae032a7888b5ce40579;p=libs%2Fgl.git

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index 99f15307..ac2b1ea7 100644
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -14,6 +14,10 @@ void operator>>(const LexicalConverter &conv, PixelFormat &fmt)
 		fmt = STENCIL_INDEX;
 	else if(conv.get()=="DEPTH_COMPONENT")
 		fmt = DEPTH_COMPONENT;
+	else if(conv.get()=="RED")
+		fmt = RED;
+	else if(conv.get()=="RG")
+		fmt = RG;
 	else if(conv.get()=="RGB")
 		fmt = RGB;
 	else if(conv.get()=="RGBA")
@@ -76,6 +80,12 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
 {
 	switch(pf)
 	{
+	case R8:
+	case R16F:
+	case R32F: return RED;
+	case RG8:
+	case RG16F:
+	case RG32F: return RG;
 	case RGB8:
 	case RGB16F:
 	case RGB32F:
@@ -87,13 +97,9 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
 	case SRGB_ALPHA:
 	case SRGB8_ALPHA8: return RGBA;
 	case LUMINANCE8:
-	case LUMINANCE16F:
-	case LUMINANCE32F:
 	case SLUMINANCE:
 	case SLUMINANCE8: return LUMINANCE;
 	case LUMINANCE_ALPHA8:
-	case LUMINANCE_ALPHA16F:
-	case LUMINANCE_ALPHA32F:
 	case SLUMINANCE_ALPHA:
 	case SLUMINANCE8_ALPHA8: return LUMINANCE_ALPHA;
 	case DEPTH_COMPONENT16:
@@ -103,6 +109,29 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
 	}
 }
 
+PixelFormat get_sized_pixelformat(PixelFormat pf)
+{
+	switch(pf)
+	{
+	case RED: return R8;
+	case RG: return RG8;
+	case RGB: return RGB8;
+	case RGBA: return RGBA8;
+	case SRGB: return SRGB8;
+	case SRGB_ALPHA: return SRGB8_ALPHA8;
+	case LUMINANCE: return LUMINANCE8;
+	case SLUMINANCE: return SLUMINANCE8;
+	case LUMINANCE_ALPHA: return LUMINANCE8_ALPHA8;
+	case SLUMINANCE_ALPHA: return SLUMINANCE8_ALPHA8;
+	case DEPTH_COMPONENT:
+		if(get_gl_api()==OPENGL_ES2)
+			return DEPTH_COMPONENT16;
+		else
+			return DEPTH_COMPONENT32;
+	default: return pf;
+	}
+}
+
 PixelFormat get_srgb_pixelformat(PixelFormat pf)
 {
 	switch(pf)
@@ -125,9 +154,11 @@ unsigned get_component_count(PixelFormat pf)
 	{
 	case STENCIL_INDEX:
 	case DEPTH_COMPONENT:
+	case RED:
 	case LUMINANCE:
 	case SLUMINANCE:
 		return 1;
+	case RG:
 	case LUMINANCE_ALPHA:
 	case SLUMINANCE_ALPHA:
 		return 2;
@@ -146,18 +177,18 @@ unsigned get_component_size(PixelFormat pf)
 {
 	switch(pf)
 	{
+	case R16F:
+	case RG16F:
 	case RGB16F:
 	case RGBA16F:
-	case LUMINANCE16F:
-	case LUMINANCE_ALPHA16F:
 	case DEPTH_COMPONENT16:
 		return 2;
 	case DEPTH_COMPONENT24:
 		return 3;
+	case R32F:
+	case RG32F:
 	case RGB32F:
 	case RGBA32F:
-	case LUMINANCE32F:
-	case LUMINANCE_ALPHA32F:
 	case DEPTH_COMPONENT32:
 		return 4;
 	default:
@@ -174,14 +205,23 @@ void require_pixelformat(PixelFormat pf)
 {
 	switch(pf)
 	{
+	case RED:
+	case R8:
+	case RG:
+	case RG8:
+		{ static Require _req(ARB_texture_rg); }
+		break;
+	case R16F:
+	case R32F:
+	case RG16F:
+	case RG32F:
+		{ static Require _req(ARB_texture_rg); }
+		{ static Require _req(ARB_texture_float); }
+		break;
 	case RGB16F:
 	case RGB32F:
 	case RGBA16F:
 	case RGBA32F:
-	case LUMINANCE16F:
-	case LUMINANCE32F:
-	case LUMINANCE_ALPHA16F:
-	case LUMINANCE_ALPHA32F:
 		{ static Require _req(ARB_texture_float); }
 		break;
 	case SRGB: