Don't add volatile to thread address space variables

KhronosGroup · Aug 7, 2024 · 467ba39 · 467ba39
1 parent 670cc7f
commit 467ba39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/reference/shaders-msl-no-opt/frag/volatile-helper-invocation.msl23.spv16.frag b/reference/shaders-msl-no-opt/frag/volatile-helper-invocation.msl23.spv16.frag
@@ -11,7 +11,7 @@ struct main0_out
 };
 
 static inline __attribute__((always_inline))
-void func(thread float& FragColor, volatile thread bool& gl_HelperInvocation)
+void func(thread float& FragColor, thread bool& gl_HelperInvocation)
 {
     bool _14 = gl_HelperInvocation;
     float _17 = float(_14);

diff --git a/spirv_msl.cpp b/spirv_msl.cpp
@@ -13213,7 +13213,10 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id, bo
 		addr_space = type.pointer || (argument && type.basetype == SPIRType::ControlPointArray) ? "thread" : "";
 	}
 
-	return join(decoration_flags_signal_volatile(flags) ? "volatile " : "", addr_space);
+	if (decoration_flags_signal_volatile(flags) && 0 != strcmp(addr_space, "thread"))
+		return join("volatile ", addr_space);
+	else
+		return addr_space;
 }
 
 const char *CompilerMSL::to_restrict(uint32_t id, bool space)