Rework setup, VS->FS structures, etc for Vulkan
- Remnants of old fixed function attributes all gone
- Initial support for some builtins to prove the model
- Setup now driven by correct shader state
- VS->FS intermediate structure matches SPIRV model -- builtins are not
in location space; location space itself is flat scalars rather than
vec4-oriented.
There are still some vertex pipe features which are not supported, as
ES3 didn't have them -- proper handling of noperspective, etc.
Change-Id: Ia8e3c72af54c4d1cbcc18482a741daa5e8e7c053
Bug: b/120799499
Reviewed-on: https://swiftshader-review.googlesource.com/c/24376
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
diff --git a/src/Pipeline/VertexProgram.cpp b/src/Pipeline/VertexProgram.cpp
index 1e0e162..7bb498f 100644
--- a/src/Pipeline/VertexProgram.cpp
+++ b/src/Pipeline/VertexProgram.cpp
@@ -32,11 +32,14 @@
enableStack[0] = Int4(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
- // TODO: wire up builtins
- //if(shader->isInstanceIdDeclared())
- //{
- // instanceID = *Pointer<Int>(data + OFFSET(DrawData,instanceID));
- //}
+ auto it = spirvShader->inputBuiltins.find(spv::BuiltInInstanceIndex);
+ if (it != spirvShader->inputBuiltins.end())
+ {
+ // TODO: we could do better here; we know InstanceIndex is uniform across all lanes
+ assert(it->second.SizeInComponents == 1);
+ (*routine.lvalues[it->second.Id])[it->second.FirstComponent] =
+ As<Float4>(Int4((*Pointer<Int>(data + OFFSET(DrawData, instanceID)))));
+ }
}
VertexProgram::~VertexProgram()
