Fix processing OpExecutionMode for the requested entry point

Previously any SPIR-V OpExecutionMode instruction would override the execution mode parameters, so a shader module with multiple entry points with different execution modes would not work as intended. Bug: b/155550449 Change-Id: I86211e66a3cef5a3bbf9e535e9be8415b5d69d4b Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/45249 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>

Fix processing OpExecutionMode for the requested entry point
57eb48ae · Nicolas Capens · Nicolas Capens · 660c3bc9 · 57eb48ae · 57eb48ae
Commit 57eb48ae authored May 15, 2020 by Nicolas Capens Committed by Nicolas Capens May 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

SpirvShader.cpp src/Pipeline/SpirvShader.cpp +7 -1

SpirvShader.hpp src/Pipeline/SpirvShader.hpp +3 -1

No files found.
--- a/src/Pipeline/SpirvShader.cpp
+++ b/src/Pipeline/SpirvShader.cpp
@@ -189,7 +189,7 @@ SpirvShader::SpirvShader(
 			case spv::OpBranchConditional:
 			case spv::OpSwitch:
 			case spv::OpReturn:
-			// fallthrough
+				// [[fallthrough]]

 			// Termination instruction:
 			case spv::OpKill:
@@ -874,6 +874,12 @@ void SpirvShader::ProcessInterfaceVariable(Object &object)

 void SpirvShader::ProcessExecutionMode(InsnIterator insn)
 {
+	Function::ID function = insn.word(1);
+	if(function != entryPoint)
+	{
+		return;
+	}
+
 	auto mode = static_cast<spv::ExecutionMode>(insn.word(2));
 	switch(mode)
 	{

--- a/src/Pipeline/SpirvShader.hpp
+++ b/src/Pipeline/SpirvShader.hpp
@@ -555,7 +555,9 @@ public:
 		bool NeedsCentroid : 1;

 		// Compute workgroup dimensions
-		int WorkgroupSizeX = 1, WorkgroupSizeY = 1, WorkgroupSizeZ = 1;
+		int WorkgroupSizeX = 1;
+		int WorkgroupSizeY = 1;
+		int WorkgroupSizeZ = 1;
 	};

 	Modes const &getModes() const