um.

gfx-rs · Sep 30, 2024 · c5af1cd · c5af1cd
1 parent 631640d
commit c5af1cd
Show file tree

Hide file tree

Showing 56 changed files with 115 additions and 0 deletions.
diff --git a/naga/src/back/msl/writer.rs b/naga/src/back/msl/writer.rs
@@ -3567,6 +3567,11 @@ impl<W: Write> Writer<W> {
         )?;
         writeln!(self.out, "#include <metal_stdlib>")?;
         writeln!(self.out, "#include <simd/simd.h>")?;
+        writeln!(
+            self.out,
+            "#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)"
+        )?;
+        writeln!(self.out, "#pragma message(__METAL_VERSION__)")?;
         writeln!(self.out)?;
         // Work around Metal bug where `uint` is not available by default
         writeln!(self.out, "using {NAMESPACE}::uint;")?;

diff --git a/naga/tests/out/msl/abstract-types-const.msl b/naga/tests/out/msl/abstract-types-const.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/abstract-types-operators.msl b/naga/tests/out/msl/abstract-types-operators.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/abstract-types-var.msl b/naga/tests/out/msl/abstract-types-var.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/access.msl b/naga/tests/out/msl/access.msl
@@ -1,6 +1,8 @@
 // language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/array-in-ctor.msl b/naga/tests/out/msl/array-in-ctor.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/array-in-function-return-type.msl b/naga/tests/out/msl/array-in-function-return-type.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/atomicOps-int64-min-max.msl b/naga/tests/out/msl/atomicOps-int64-min-max.msl
@@ -1,6 +1,8 @@
 // language: metal2.4
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/atomicOps.msl b/naga/tests/out/msl/atomicOps.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/atomicTexture-int64.msl b/naga/tests/out/msl/atomicTexture-int64.msl
@@ -1,6 +1,8 @@
 // language: metal3.1
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/binding-arrays.msl b/naga/tests/out/msl/binding-arrays.msl
@@ -1,6 +1,8 @@
 // language: metal2.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 struct DefaultConstructible {

diff --git a/naga/tests/out/msl/bitcast.msl b/naga/tests/out/msl/bitcast.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/bits.msl b/naga/tests/out/msl/bits.msl
@@ -1,6 +1,8 @@
 // language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/boids.msl b/naga/tests/out/msl/boids.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/bounds-check-image-restrict.msl b/naga/tests/out/msl/bounds-check-image-restrict.msl
@@ -1,6 +1,8 @@
 // language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/bounds-check-image-rzsw.msl b/naga/tests/out/msl/bounds-check-image-rzsw.msl
@@ -1,6 +1,8 @@
 // language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 struct DefaultConstructible {

diff --git a/naga/tests/out/msl/bounds-check-restrict.msl b/naga/tests/out/msl/bounds-check-restrict.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/bounds-check-zero-atomic.msl b/naga/tests/out/msl/bounds-check-zero-atomic.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 struct DefaultConstructible {

diff --git a/naga/tests/out/msl/bounds-check-zero.msl b/naga/tests/out/msl/bounds-check-zero.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 struct DefaultConstructible {

diff --git a/naga/tests/out/msl/break-if.msl b/naga/tests/out/msl/break-if.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/collatz.msl b/naga/tests/out/msl/collatz.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/const-exprs.msl b/naga/tests/out/msl/const-exprs.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/constructors.msl b/naga/tests/out/msl/constructors.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/control-flow.msl b/naga/tests/out/msl/control-flow.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/cross.msl b/naga/tests/out/msl/cross.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/dualsource.msl b/naga/tests/out/msl/dualsource.msl
@@ -1,6 +1,8 @@
 // language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/empty.msl b/naga/tests/out/msl/empty.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/extra.msl b/naga/tests/out/msl/extra.msl
@@ -1,6 +1,8 @@
 // language: metal2.2
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/fragment-output.msl b/naga/tests/out/msl/fragment-output.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/functions.msl b/naga/tests/out/msl/functions.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/globals.msl b/naga/tests/out/msl/globals.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/image.msl b/naga/tests/out/msl/image.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/int64.msl b/naga/tests/out/msl/int64.msl
@@ -1,6 +1,8 @@
 // language: metal2.3
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/interface.msl b/naga/tests/out/msl/interface.msl
@@ -1,6 +1,8 @@
 // language: metal2.1
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/interpolate.msl b/naga/tests/out/msl/interpolate.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/interpolate_compat.msl b/naga/tests/out/msl/interpolate_compat.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/math-functions.msl b/naga/tests/out/msl/math-functions.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/msl-varyings.msl b/naga/tests/out/msl/msl-varyings.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/operators.msl b/naga/tests/out/msl/operators.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/overrides-ray-query.msl b/naga/tests/out/msl/overrides-ray-query.msl
@@ -1,6 +1,8 @@
 // language: metal2.4
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 struct _RayQuery {

diff --git a/naga/tests/out/msl/overrides.msl b/naga/tests/out/msl/overrides.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/padding.msl b/naga/tests/out/msl/padding.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/phony_assignment.msl b/naga/tests/out/msl/phony_assignment.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 

diff --git a/naga/tests/out/msl/policy-mix.msl b/naga/tests/out/msl/policy-mix.msl
@@ -1,6 +1,8 @@
 // language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
+#pragma message(__HAVE_TEXTURE_RELAXED_ORDER_ATOMIC__)
+#pragma message(__METAL_VERSION__)
 
 using metal::uint;
 struct DefaultConstructible {