Blitter fix

Conversion from a float format to a non float format was broken in the blitter because the clamp operation, either to the [0,1] range or the [-1,1] range, was happening after the scaling operation, so non float types were becoming either -1, 0 or 1, which was wrong. Change-Id: I3e1290313043fc49030454916b6e4ea6666f8343 Reviewed-on: https://swiftshader-review.googlesource.com/4290Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Blitter fix
34cab51b · Alexis Hetu · Alexis Hétu · 1edcd8b6 · 34cab51b
Commit 34cab51b authored Nov 19, 2015 by Alexis Hetu Committed by Alexis Hétu Nov 20, 2015
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Blitter.cpp src/Renderer/Blitter.cpp +5 -5

No files found.
--- a/src/Renderer/Blitter.cpp
+++ b/src/Renderer/Blitter.cpp
@@ -752,12 +752,12 @@ namespace sw
 						if(Surface::isFloatFormat(state.sourceFormat) && !Surface::isFloatFormat(state.destFormat))
 						{
-							color = Min(color, Float4(1.0f, 1.0f, 1.0f, 1.0f));
+							color = Min(color, Float4(scale.x, scale.y, scale.z, scale.w));
-							color = Max(color, Float4(Surface::isUnsignedComponent(state.destFormat, 0) ? 0.0f : -1.0f,
+							color = Max(color, Float4(Surface::isUnsignedComponent(state.destFormat, 0) ? 0.0f : -scale.x,
-							                          Surface::isUnsignedComponent(state.destFormat, 1) ? 0.0f : -1.0f,
+							                          Surface::isUnsignedComponent(state.destFormat, 1) ? 0.0f : -scale.y,
-							                          Surface::isUnsignedComponent(state.destFormat, 2) ? 0.0f : -1.0f,
+							                          Surface::isUnsignedComponent(state.destFormat, 2) ? 0.0f : -scale.z,
-							                          Surface::isUnsignedComponent(state.destFormat, 3) ? 0.0f : -1.0f));
+							                          Surface::isUnsignedComponent(state.destFormat, 3) ? 0.0f : -scale.w));
 						}
 						Pointer<Byte> d = destLine + i * Surface::bytes(state.destFormat);