Set up VertexIndex builtin properly

Bug: b/124177079 Change-Id: Ie51c9e8865f12583ece35a1d1d6c558d2ed1281b Reviewed-on: https://swiftshader-review.googlesource.com/c/24590Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Tested-by: Chris Forbes <chrisforbes@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Set up VertexIndex builtin properly
d007720b · Chris Forbes · 78d2e664 · d007720b · d007720b
Commit d007720b authored Feb 10, 2019 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 17 deletions

VertexProgram.cpp src/Pipeline/VertexProgram.cpp +7 -14

VertexProgram.hpp src/Pipeline/VertexProgram.hpp +0 -3

No files found.
--- a/src/Pipeline/VertexProgram.cpp
+++ b/src/Pipeline/VertexProgram.cpp
@@ -52,20 +52,13 @@ namespace sw
 		enableIndex = 0;
-		//if(shader->isVertexIdDeclared())
+		auto it = spirvShader->inputBuiltins.find(spv::BuiltInVertexIndex);
-		//{
+		if (it != spirvShader->inputBuiltins.end())
-		//	if(state.textureSampling)
+		{
-		//	{
+			assert(it->second.SizeInComponents == 1);
-		//		vertexID = Int4(index);
+			(*routine.lvalues[it->second.Id])[it->second.FirstComponent] =
-		//	}
+					As<Float4>(Int4(index) + Int4(0, 1, 2, 3));
-		//	else
+		}
-		//	{
-		//		vertexID = Insert(vertexID, As<Int>(index), 0);
-		//		vertexID = Insert(vertexID, As<Int>(index + 1), 1);
-		//		vertexID = Insert(vertexID, As<Int>(index + 2), 2);
-		//		vertexID = Insert(vertexID, As<Int>(index + 3), 3);
-		//	}
-		//}
 		spirvShader->emit(&routine);

--- a/src/Pipeline/VertexProgram.hpp
+++ b/src/Pipeline/VertexProgram.hpp
@@ -37,9 +37,6 @@ namespace sw
 		Int enableIndex;
 		Array<Int4, 1 + 24> enableStack;
-		Int instanceID;
-		Int4 vertexID;
 		void program(UInt &index) override;
 		RValue<Pointer<Byte>> uniformAddress(int bufferIndex, unsigned int index);
 		RValue<Pointer<Byte>> uniformAddress(int bufferIndex, unsigned int index, Int &offset);