Remove redundant R5G6R5 conversions

The code to compute the final RGB565 conversion is now generated once instead of being generated 4 times. Change-Id: Id90ddd28d6ec4fb957d8093e6b9689462751002b Reviewed-on: https://swiftshader-review.googlesource.com/10609Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Alexis Hétu <sugoi@google.com>

Remove redundant R5G6R5 conversions
ab849aec · Alexis Hetu · Alexis Hétu · 6b064940 · ab849aec
Commit ab849aec authored Jul 14, 2017 by Alexis Hetu Committed by Alexis Hétu Jul 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 23 deletions

SamplerCore.cpp src/Shader/SamplerCore.cpp +23 -23

No files found.
--- a/src/Shader/SamplerCore.cpp
+++ b/src/Shader/SamplerCore.cpp
@@ -360,35 +360,35 @@ namespace sw
 				sampleTexture(texture, cs, u, v, w, q, dsx, dsy, offset, function, false);
-				for(int component = 0; component < textureComponentCount(); component++)
+				if(has16bitTextureFormat())
 				{
-					if(has16bitTextureFormat())
+					switch(state.textureFormat)
 					{
-						switch(state.textureFormat)
+					case FORMAT_R5G6B5:
+						if(state.sRGB)
 						{
-						case FORMAT_R5G6B5:
+							sRGBtoLinear16_5_12(cs.x);
-							if(state.sRGB)
+							sRGBtoLinear16_6_12(cs.y);
-							{
+							sRGBtoLinear16_5_12(cs.z);
-								sRGBtoLinear16_5_12(cs.x);
-								sRGBtoLinear16_6_12(cs.y);
-								sRGBtoLinear16_5_12(cs.z);
-								convertSigned12(c.x, cs.x);
+							convertSigned12(c.x, cs.x);
-								convertSigned12(c.y, cs.y);
+							convertSigned12(c.y, cs.y);
-								convertSigned12(c.z, cs.z);
+							convertSigned12(c.z, cs.z);
-							}
-							else
-							{
-								c.x = Float4(As<UShort4>(cs.x)) * Float4(1.0f / 0xF800);
-								c.y = Float4(As<UShort4>(cs.y)) * Float4(1.0f / 0xFC00);
-								c.z = Float4(As<UShort4>(cs.z)) * Float4(1.0f / 0xF800);
-							}
-							break;
-						default:
-							ASSERT(false);
 						}
+						else
+						{
+							c.x = Float4(As<UShort4>(cs.x)) * Float4(1.0f / 0xF800);
+							c.y = Float4(As<UShort4>(cs.y)) * Float4(1.0f / 0xFC00);
+							c.z = Float4(As<UShort4>(cs.z)) * Float4(1.0f / 0xF800);
+						}
+						break;
+					default:
+						ASSERT(false);
 					}
-					else
+				}
+				else
+				{
+					for(int component = 0; component < textureComponentCount(); component++)
 					{
 						switch(state.textureFormat)
 						{