X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frendertarget.cpp;h=5c4cc20ffdcbd05c477eacde748fb2a8a3170c8a;hb=f2ad2730858046b08e8147297fa01bf3499b86a3;hp=1349944b862ff969f6347d5ca070696bb597f09b;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/render/rendertarget.cpp b/source/render/rendertarget.cpp
index 1349944b..5c4cc20f 100644
--- a/source/render/rendertarget.cpp
+++ b/source/render/rendertarget.cpp
@@ -35,23 +35,32 @@ RenderTargetFormat RenderTargetFormat::operator,(PixelFormat f) const
 		throw invalid_operation("RenderTargetFormat::operator,");
 
 	PixelComponents comp = get_components(f);
-	unsigned size = get_component_size(f);
+	DataType type = get_component_type(f);
+	unsigned size = 0;
 	unsigned char out = outputs[count-1];
 	if(get_output_type(out)>=get_output_type(RENDER_DEPTH))
 	{
 		if(comp!=DEPTH_COMPONENT)
 			throw invalid_argument("RenderTargetFormat::operator,");
-		if(size>1)
-			--size;
-		if(get_component_type(f)==UNSIGNED_INT)
-			--size;
+		switch(type)
+		{
+		case UNSIGNED_SHORT: size = 0; break;
+		case UNSIGNED_INT: size = 2; break;
+		case FLOAT: size = 3; break;
+		default: throw invalid_argument("RenderTargetFormat::operator,");
+		}
 	}
 	else
 	{
 		if(comp!=RED && comp!=RG && comp!=RGB && comp!=RGBA)
 			throw invalid_argument("RenderTargetformat::operator,");
-		if(size>3)
-			--size;
+		switch(type)
+		{
+		case UNSIGNED_BYTE: size = 0; break;
+		case HALF_FLOAT: size = 2; break;
+		case FLOAT: size = 3; break;
+		default: throw invalid_argument("RenderTargetFormat::operator,");
+		}
 	}
 
 	out = (out&~15) | (size<<2) | (get_component_count(f)-1);