Don't flag temporary registers as used samplers.

This fixes a undefined shift if the temporary register has an index higher than 32 (also, we only have 16 samplers currently). For GLSL we declare all actual sampler units during ASM output, so we don't have to rely on analyzing the instructions afterwards (that is only still relevant for Direct3D 8/9 shaders). Change-Id: I11a58964d53fcc2c29e0ad923d9a4a4161a545f4 Reviewed-on: https://swiftshader-review.googlesource.com/18748Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Don't flag temporary registers as used samplers.
336cdd90 · Nicolas Capens · Nicolas Capens · e76163e3 · 336cdd90
Commit 336cdd90 authored May 04, 2018 by Nicolas Capens Committed by Nicolas Capens May 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Shader.cpp src/Shader/Shader.cpp +4 -1

No files found.
--- a/src/Shader/Shader.cpp
+++ b/src/Shader/Shader.cpp
@@ -1856,7 +1856,10 @@ namespace sw

 					if(majorVersion >= 2)
 					{
-						usedSamplers |= 1 << src1.index;
+						if(src1.type == PARAMETER_SAMPLER)
+						{
+							usedSamplers |= 1 << src1.index;
+						}
 					}
 					else
 					{