Wire up subgroup input builtins in graphics pipe
- BuiltInSubgroupSize
- BuiltInSubgroupLocalInvocationId
Bug: b/118386749
Test: dEQP-VK.subgroups.*
Change-Id: Idf06213351f2ac27664cc6bee1b6b99575676843
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/29308
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
diff --git a/src/Pipeline/PixelProgram.cpp b/src/Pipeline/PixelProgram.cpp
index 305d7d5..02eacaa 100644
--- a/src/Pipeline/PixelProgram.cpp
+++ b/src/Pipeline/PixelProgram.cpp
@@ -33,6 +33,20 @@
var[it->second.FirstComponent+2] = z[0]; // sample 0
var[it->second.FirstComponent+3] = w;
}
+
+ it = spirvShader->inputBuiltins.find(spv::BuiltInSubgroupSize);
+ if (it != spirvShader->inputBuiltins.end())
+ {
+ ASSERT(it->second.SizeInComponents == 1);
+ routine.getVariable(it->second.Id)[it->second.FirstComponent] = As<SIMD::Float>(Int(SIMD::Width));
+ }
+
+ it = spirvShader->inputBuiltins.find(spv::BuiltInSubgroupLocalInvocationId);
+ if (it != spirvShader->inputBuiltins.end())
+ {
+ ASSERT(it->second.SizeInComponents == 1);
+ routine.getVariable(it->second.Id)[it->second.FirstComponent] = As<SIMD::Float>(SIMD::Int(0, 1, 2, 3));
+ }
}
void PixelProgram::applyShader(Int cMask[4])
diff --git a/src/Pipeline/VertexProgram.cpp b/src/Pipeline/VertexProgram.cpp
index ea840f0..63c890f 100644
--- a/src/Pipeline/VertexProgram.cpp
+++ b/src/Pipeline/VertexProgram.cpp
@@ -44,6 +44,20 @@
routine.descriptorSets = data + OFFSET(DrawData, descriptorSets);
routine.descriptorDynamicOffsets = data + OFFSET(DrawData, descriptorDynamicOffsets);
routine.pushConstants = data + OFFSET(DrawData, pushConstants);
+
+ it = spirvShader->inputBuiltins.find(spv::BuiltInSubgroupSize);
+ if (it != spirvShader->inputBuiltins.end())
+ {
+ ASSERT(it->second.SizeInComponents == 1);
+ routine.getVariable(it->second.Id)[it->second.FirstComponent] = As<SIMD::Float>(Int(SIMD::Width));
+ }
+
+ it = spirvShader->inputBuiltins.find(spv::BuiltInSubgroupLocalInvocationId);
+ if (it != spirvShader->inputBuiltins.end())
+ {
+ ASSERT(it->second.SizeInComponents == 1);
+ routine.getVariable(it->second.Id)[it->second.FirstComponent] = As<SIMD::Float>(SIMD::Int(0, 1, 2, 3));
+ }
}
VertexProgram::~VertexProgram()
