Uniform buffer array register fix

Register indices were only set for the first instance of the array when the uniform block array was present in both the fragment and vertex shaders, so this code takes care of the array case. Change-Id: I8a98470fedcc67bdc5edfd3b852470f5f911d610 Reviewed-on: https://swiftshader-review.googlesource.com/4630Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Uniform buffer array register fix
2cb618d6 · Alexis Hetu · Alexis Hétu · ccd97810 · 2cb618d6
Commit 2cb618d6 authored Feb 01, 2016 by Alexis Hetu Committed by Alexis Hétu Feb 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

Program.cpp src/OpenGL/libGLESv2/Program.cpp +7 -1

No files found.
--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -1710,7 +1710,13 @@ namespace es2
 		}
 		else
 		{
-			uniformBlocks[blockIndex]->setRegisterIndex(shader->getType(), block.registerIndex);
+			int regIndex = block.registerIndex;
+			int regInc = block.dataSize / (glsl::BlockLayoutEncoder::BytesPerComponent * glsl::BlockLayoutEncoder::ComponentsPerRegister);
+			int nbBlocks = (block.arraySize > 0) ? block.arraySize : 1;
+			for(int i = 0; i < nbBlocks; ++i, regIndex += regInc)
+			{
+				uniformBlocks[blockIndex + i]->setRegisterIndex(shader->getType(), regIndex);
+			}
 		}
 		return true;