Use SpvOpExecutionModeId for modes that require it

shader-slang · Jan 5, 2025 · 1862056 · 1862056
1 parent 2cda16c
commit 1862056
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/source/slang/slang-check-modifier.cpp b/source/slang/slang-check-modifier.cpp
@@ -1909,8 +1909,7 @@ Modifier* SemanticsVisitor::checkModifier(
 
                         for (auto member : decl->parentDecl->members)
                         {
-                            auto constantId =
-                                member->findModifier<VkConstantIdAttribute>();
+                            auto constantId = member->findModifier<VkConstantIdAttribute>();
                             if (constantId)
                             {
                                 SLANG_ASSERT(constantId->args.getCount() == 1);

diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp
@@ -7967,10 +7967,18 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
     {
         if (m_executionModes[entryPoint].add(executionMode))
         {
+            SpvOp execModeOp = SpvOpExecutionMode;
+            if (executionMode == SpvExecutionModeLocalSizeId ||
+                executionMode == SpvExecutionModeLocalSizeHintId ||
+                executionMode == SpvExecutionModeSubgroupsPerWorkgroupId)
+            {
+                execModeOp = SpvOpExecutionModeId;
+            }
+
             emitInst(
                 getSection(SpvLogicalSectionID::ExecutionModes),
                 parentInst,
-                SpvOpExecutionMode,
+                execModeOp,
                 entryPoint,
                 executionMode,
                 ops...);