Merge pull request #2500 from KhronosGroup/pr-2495

HansKristian-Work · web-flow · commit 2345c781f7fc · 2025-06-23T14:37:23.000+02:00
Land PR 2495
diff --git a/reference/opt/shaders-msl/asm/comp/atomic-decrement.asm.comp b/reference/opt/shaders-msl/asm/comp/atomic-decrement.asm.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/asm/comp/atomic-increment.asm.comp b/reference/opt/shaders-msl/asm/comp/atomic-increment.asm.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/atomic-image.comp b/reference/opt/shaders-msl/comp/atomic-image.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/coherent-image-atomic.comp b/reference/opt/shaders-msl/comp/coherent-image-atomic.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/coherent-image-atomic.msl2.argument.comp b/reference/opt/shaders-msl/comp/coherent-image-atomic.msl2.argument.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/coherent-image-atomic.msl2.comp b/reference/opt/shaders-msl/comp/coherent-image-atomic.msl2.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/image-atomic-automatic-bindings.argument.msl2.comp b/reference/opt/shaders-msl/comp/image-atomic-automatic-bindings.argument.msl2.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/image-atomic-automatic-bindings.comp b/reference/opt/shaders-msl/comp/image-atomic-automatic-bindings.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/comp/raw-buffer-descriptor-aliasing.argument.discrete.device-argument-buffer.msl2.decoration-binding.comp b/reference/opt/shaders-msl/comp/raw-buffer-descriptor-aliasing.argument.discrete.device-argument-buffer.msl2.decoration-binding.comp
@@ -1,4 +1,5 @@
 #pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
+
 #include <metal_stdlib>
 #include <simd/simd.h>
 
diff --git a/reference/opt/shaders-msl/comp/shared-zero-init-simple.comp b/reference/opt/shaders-msl/comp/shared-zero-init-simple.comp
@@ -1,4 +1,5 @@
 #pragma clang diagnostic ignored "-Wsometimes-uninitialized"
+
 #include <metal_stdlib>
 #include <simd/simd.h>
 
diff --git a/reference/opt/shaders-msl/frag/frag-demote-checks.discard-checks.msl23.frag b/reference/opt/shaders-msl/frag/frag-demote-checks.discard-checks.msl23.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/frag/frag-discard-checks.discard-checks.msl23.frag b/reference/opt/shaders-msl/frag/frag-discard-checks.discard-checks.msl23.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl2.argument.frag b/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl2.argument.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl2.frag b/reference/opt/shaders-msl/frag/pixel-interlock-ordered.msl2.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl-no-opt/asm/comp/image-atomic-mismatch-sign.asm.msl31.comp b/reference/shaders-msl-no-opt/asm/comp/image-atomic-mismatch-sign.asm.msl31.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl-no-opt/comp/extract-atomics-from-function.comp b/reference/shaders-msl-no-opt/comp/extract-atomics-from-function.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp b/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp
@@ -3,9 +3,9 @@
 
 using namespace metal;
 
-typedef packed_float2 packed_float2x2[2];
 typedef packed_float3 packed_float2x3[2];
 typedef packed_float3 packed_rm_float3x2[2];
+typedef packed_float2 packed_float2x2[2];
 
 struct S0
 {
diff --git a/reference/shaders-msl/asm/comp/atomic-decrement.asm.comp b/reference/shaders-msl/asm/comp/atomic-decrement.asm.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/asm/comp/atomic-increment.asm.comp b/reference/shaders-msl/asm/comp/atomic-increment.asm.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/atomic-image.comp b/reference/shaders-msl/comp/atomic-image.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/coherent-image-atomic.comp b/reference/shaders-msl/comp/coherent-image-atomic.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/coherent-image-atomic.msl2.argument.comp b/reference/shaders-msl/comp/coherent-image-atomic.msl2.argument.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/coherent-image-atomic.msl2.comp b/reference/shaders-msl/comp/coherent-image-atomic.msl2.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/coherent-image-atomic.msl31.argument.comp b/reference/shaders-msl/comp/coherent-image-atomic.msl31.argument.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/coherent-image-atomic.msl31.comp b/reference/shaders-msl/comp/coherent-image-atomic.msl31.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/image-atomic-automatic-bindings.argument.msl2.comp b/reference/shaders-msl/comp/image-atomic-automatic-bindings.argument.msl2.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/image-atomic-automatic-bindings.comp b/reference/shaders-msl/comp/image-atomic-automatic-bindings.comp
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/comp/shared-zero-init-simple.comp b/reference/shaders-msl/comp/shared-zero-init-simple.comp
@@ -1,4 +1,5 @@
 #pragma clang diagnostic ignored "-Wsometimes-uninitialized"
+
 #include <metal_stdlib>
 #include <simd/simd.h>
 
diff --git a/reference/shaders-msl/frag/frag-demote-checks.discard-checks.msl23.frag b/reference/shaders-msl/frag/frag-demote-checks.discard-checks.msl23.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/frag/frag-demote-checks.discard-checks.msl31.frag b/reference/shaders-msl/frag/frag-demote-checks.discard-checks.msl31.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/frag/frag-discard-checks.discard-checks.msl23.frag b/reference/shaders-msl/frag/frag-discard-checks.discard-checks.msl23.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/frag/frag-discard-checks.discard-checks.msl31.frag b/reference/shaders-msl/frag/frag-discard-checks.discard-checks.msl31.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/frag/pixel-interlock-ordered.msl2.argument.frag b/reference/shaders-msl/frag/pixel-interlock-ordered.msl2.argument.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-msl/frag/pixel-interlock-ordered.msl2.frag b/reference/shaders-msl/frag/pixel-interlock-ordered.msl2.frag
@@ -1,5 +1,5 @@
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wunused-variable"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-ue4/asm/frag/texture-atomics.asm.argument.msl2.frag b/reference/shaders-ue4/asm/frag/texture-atomics.asm.argument.msl2.frag
@@ -1,6 +1,6 @@
+#pragma clang diagnostic ignored "-Wunused-variable"
 #pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wmissing-braces"
-#pragma clang diagnostic ignored "-Wunused-variable"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-ue4/asm/frag/texture-atomics.asm.frag b/reference/shaders-ue4/asm/frag/texture-atomics.asm.frag
@@ -1,6 +1,6 @@
+#pragma clang diagnostic ignored "-Wunused-variable"
 #pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wmissing-braces"
-#pragma clang diagnostic ignored "-Wunused-variable"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/reference/shaders-ue4/asm/frag/texture-atomics.asm.graphics-robust-access.frag b/reference/shaders-ue4/asm/frag/texture-atomics.asm.graphics-robust-access.frag
@@ -1,6 +1,6 @@
+#pragma clang diagnostic ignored "-Wunused-variable"
 #pragma clang diagnostic ignored "-Wmissing-prototypes"
 #pragma clang diagnostic ignored "-Wmissing-braces"
-#pragma clang diagnostic ignored "-Wunused-variable"
 
 #include <metal_stdlib>
 #include <simd/simd.h>
diff --git a/spirv_common.hpp b/spirv_common.hpp
@@ -697,6 +697,7 @@ struct SPIREntryPoint
 	FunctionID self = 0;
 	std::string name;
 	std::string orig_name;
+	std::unordered_map<uint32_t, uint32_t> fp_fast_math_defaults;
 	SmallVector<VariableID> interface_variables;
 
 	Bitset flags;
@@ -1768,6 +1769,7 @@ struct Meta
 		uint32_t spec_id = 0;
 		uint32_t index = 0;
 		spv::FPRoundingMode fp_rounding_mode = spv::FPRoundingModeMax;
+		spv::FPFastMathModeMask fp_fast_math_mode = spv::FPFastMathModeMaskNone;
 		bool builtin = false;
 		bool qualified_alias_explicit_override = false;
 
diff --git a/spirv_cross.cpp b/spirv_cross.cpp
@@ -2370,6 +2370,10 @@ void Compiler::set_execution_mode(ExecutionMode mode, uint32_t arg0, uint32_t ar
 		execution.output_primitives = arg0;
 		break;
 
+	case ExecutionModeFPFastMathDefault:
+		execution.fp_fast_math_defaults[arg0] = arg1;
+		break;
+
 	default:
 		break;
 	}
diff --git a/spirv_cross_parsed_ir.cpp b/spirv_cross_parsed_ir.cpp
@@ -452,6 +452,10 @@ void ParsedIR::set_decoration(ID id, Decoration decoration, uint32_t argument)
 		dec.fp_rounding_mode = static_cast<FPRoundingMode>(argument);
 		break;
 
+	case DecorationFPFastMathMode:
+		dec.fp_fast_math_mode = static_cast<FPFastMathModeMask>(argument);
+		break;
+
 	default:
 		break;
 	}
@@ -643,6 +647,8 @@ uint32_t ParsedIR::get_decoration(ID id, Decoration decoration) const
 		return dec.index;
 	case DecorationFPRoundingMode:
 		return dec.fp_rounding_mode;
+	case DecorationFPFastMathMode:
+		return dec.fp_fast_math_mode;
 	default:
 		return 1;
 	}
@@ -730,6 +736,10 @@ void ParsedIR::unset_decoration(ID id, Decoration decoration)
 		dec.fp_rounding_mode = FPRoundingModeMax;
 		break;
 
+	case DecorationFPFastMathMode:
+		dec.fp_fast_math_mode = FPFastMathModeMaskNone;
+		break;
+
 	case DecorationHlslCounterBufferGOOGLE:
 	{
 		auto &counter = meta[id].hlsl_magic_counter_buffer;
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
diff --git a/spirv_msl.hpp b/spirv_msl.hpp
diff --git a/spirv_parser.cpp b/spirv_parser.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"`
	`2`	`+`
`2`	`3`	`#include <metal_stdlib>`
`3`	`4`	`#include <simd/simd.h>`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#pragma clang diagnostic ignored "-Wsometimes-uninitialized"`
	`2`	`+`
`2`	`3`	`#include <metal_stdlib>`
`3`	`4`	`#include <simd/simd.h>`
`4`	`5`