commit 32980acb4092207c3fa5601002f89765941ece47
author Nicolas Capens <capn@google.com> Mon Aug 15 15:33:58 2016 -0400
committer Nicolas Capens <capn@google.com> Fri Sep 09 15:29:26 2016 +0000
tree 4d1aa30c9dc6dd8a99ba86bb9b163358731af1a7
parent 24c8cf096174ba6c37b719d9caf13933ea9b12c9

Fix indexing with instance ID.

BUG=swiftshader:3

Change-Id: I070059f3b4e9e431c7667b98017912b72d9d66a4
Reviewed-on: https://swiftshader-review.googlesource.com/6952
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/Shader/VertexProgram.cpp

diff --git a/src/Shader/VertexProgram.cpp b/src/Shader/VertexProgram.cpp
index b855933..8e1d662 100644
--- a/src/Shader/VertexProgram.cpp
+++ b/src/Shader/VertexProgram.cpp
@@ -856,11 +856,12 @@
 
 				switch(src.rel.type)
 				{
-				case Shader::PARAMETER_ADDR:   a = a0[component]; break;
-				case Shader::PARAMETER_TEMP:   a = r[src.rel.index][component]; break;
-				case Shader::PARAMETER_INPUT:  a = v[src.rel.index][component]; break;
-				case Shader::PARAMETER_OUTPUT: a = o[src.rel.index][component]; break;
-				case Shader::PARAMETER_CONST:  a = *Pointer<Float>(uniformAddress(src.bufferIndex, src.rel.index) + component * sizeof(float)); break;
+				case Shader::PARAMETER_ADDR:     a = a0[component]; break;
+				case Shader::PARAMETER_TEMP:     a = r[src.rel.index][component]; break;
+				case Shader::PARAMETER_INPUT:    a = v[src.rel.index][component]; break;
+				case Shader::PARAMETER_OUTPUT:   a = o[src.rel.index][component]; break;
+				case Shader::PARAMETER_CONST:    a = *Pointer<Float>(uniformAddress(src.bufferIndex, src.rel.index) + component * sizeof(float)); break;
+				case Shader::PARAMETER_MISCTYPE: a = As<Float4>(Int4(instanceID)); break;
 				default: ASSERT(false);
 				}