[msl-out] remove min version check on storage address space

gfx-rs · Sep 18, 2023 · 3456b37 · 3456b37
1 parent df8107b
commit 3456b37
Show file tree

Hide file tree

Showing 45 changed files with 51 additions and 58 deletions.
diff --git a/src/back/msl/mod.rs b/src/back/msl/mod.rs
@@ -127,8 +127,6 @@ pub enum Error {
     UnsupportedBuiltIn(crate::BuiltIn),
     #[error("capability {0:?} is not supported")]
     CapabilityNotSupported(crate::valid::Capabilities),
-    #[error("address space {0:?} is not supported for target MSL version")]
-    UnsupportedAddressSpace(crate::AddressSpace),
     #[error("attribute '{0}' is not supported for target MSL version")]
     UnsupportedAttribute(String),
 }
@@ -197,7 +195,7 @@ pub struct Options {
 impl Default for Options {
     fn default() -> Self {
         Options {
-            lang_version: (2, 0),
+            lang_version: (1, 0),
             per_entry_point_map: EntryPointResourceMap::default(),
             inline_samplers: Vec::new(),
             spirv_cross_compatibility: false,

diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs
@@ -3916,9 +3916,6 @@ impl<W: Write> Writer<W> {
                 let resolved = match var.space {
                     crate::AddressSpace::PushConstant => options.resolve_push_constants(ep).ok(),
                     crate::AddressSpace::WorkGroup => None,
-                    crate::AddressSpace::Storage { .. } if options.lang_version < (2, 0) => {
-                        return Err(Error::UnsupportedAddressSpace(var.space))
-                    }
                     _ => options
                         .resolve_resource_binding(ep, var.binding.as_ref().unwrap())
                         .ok(),

diff --git a/tests/in/access.param.ron b/tests/in/access.param.ron
@@ -5,7 +5,7 @@
 		adjust_coordinate_space: false,
 	),
 	msl: (
-		lang_version: (2, 0),
+		lang_version: (1, 2),
 		per_entry_point_map: {
 			"foo_vert": (
 				resources: {

diff --git a/tests/in/bitcast.params.ron b/tests/in/bitcast.params.ron
@@ -1,6 +1,6 @@
 (
 	msl: (
-		lang_version: (1, 2),
+		lang_version: (1, 0),
 		per_entry_point_map: {
 			"main": (
 				resources: {

diff --git a/tests/in/boids.param.ron b/tests/in/boids.param.ron
@@ -5,7 +5,7 @@
 		adjust_coordinate_space: false,
 	),
 	msl: (
-		lang_version: (2, 0),
+		lang_version: (1, 0),
 		per_entry_point_map: {
 			"main": (
 				resources: {

diff --git a/tests/in/dualsource.param.ron b/tests/in/dualsource.param.ron
@@ -1,13 +1,11 @@
 (
     god_mode: true,
-    vertex:[
-    ],
-    fragment:[
-        (
-            entry_point:"main",
-            target_profile:"ps_5_1",
-        ),
-    ],
-    compute:[
-    ],
+    msl: (
+		lang_version: (1, 2),
+		per_entry_point_map: {},
+		inline_samplers: [],
+		spirv_cross_compatibility: false,
+		fake_missing_bindings: false,
+		zero_initialize_workgroup_memory: true,
+	),
 )
diff --git a/tests/in/padding.param.ron b/tests/in/padding.param.ron
@@ -5,7 +5,7 @@
 		adjust_coordinate_space: false,
 	),
 	msl: (
-		lang_version: (2, 0),
+		lang_version: (1, 0),
 		per_entry_point_map: {
 			"vertex": (
 				resources: {

diff --git a/tests/in/resource-binding-map.param.ron b/tests/in/resource-binding-map.param.ron
@@ -1,7 +1,7 @@
 (
 	god_mode: true,
 	msl: (
-		lang_version: (2, 0),
+		lang_version: (1, 0),
 		per_entry_point_map: {
 			"entry_point_one": (
 				resources: {

diff --git a/tests/in/workgroup-var-init.param.ron b/tests/in/workgroup-var-init.param.ron
@@ -5,7 +5,7 @@
 		adjust_coordinate_space: false,
 	),
 	msl: (
-		lang_version: (2, 0),
+		lang_version: (1, 0),
 		per_entry_point_map: {
 			"main": (
 				resources: {

diff --git a/tests/out/msl/access.msl b/tests/out/msl/access.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/array-in-ctor.msl b/tests/out/msl/array-in-ctor.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/array-in-function-return-type.msl b/tests/out/msl/array-in-function-return-type.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/atomicOps.msl b/tests/out/msl/atomicOps.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/bitcast.msl b/tests/out/msl/bitcast.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/boids.msl b/tests/out/msl/boids.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/bounds-check-image-restrict.msl b/tests/out/msl/bounds-check-image-restrict.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/bounds-check-image-rzsw.msl b/tests/out/msl/bounds-check-image-rzsw.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/bounds-check-restrict.msl b/tests/out/msl/bounds-check-restrict.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/bounds-check-zero-atomic.msl b/tests/out/msl/bounds-check-zero-atomic.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/bounds-check-zero.msl b/tests/out/msl/bounds-check-zero.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/break-if.msl b/tests/out/msl/break-if.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/collatz.msl b/tests/out/msl/collatz.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/constructors.msl b/tests/out/msl/constructors.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/control-flow.msl b/tests/out/msl/control-flow.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/do-while.msl b/tests/out/msl/do-while.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/dualsource.msl b/tests/out/msl/dualsource.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.2
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/empty-global-name.msl b/tests/out/msl/empty-global-name.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/empty.msl b/tests/out/msl/empty.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/fragment-output.msl b/tests/out/msl/fragment-output.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/functions.msl b/tests/out/msl/functions.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/globals.msl b/tests/out/msl/globals.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/image.msl b/tests/out/msl/image.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/interpolate.msl b/tests/out/msl/interpolate.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/math-functions.msl b/tests/out/msl/math-functions.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/operators.msl b/tests/out/msl/operators.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/padding.msl b/tests/out/msl/padding.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/policy-mix.msl b/tests/out/msl/policy-mix.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/quad-vert.msl b/tests/out/msl/quad-vert.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/quad.msl b/tests/out/msl/quad.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/resource-binding-map.msl b/tests/out/msl/resource-binding-map.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/shadow.msl b/tests/out/msl/shadow.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/standard.msl b/tests/out/msl/standard.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/texture-arg.msl b/tests/out/msl/texture-arg.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/workgroup-uniform-load.msl b/tests/out/msl/workgroup-uniform-load.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>
 

diff --git a/tests/out/msl/workgroup-var-init.msl b/tests/out/msl/workgroup-var-init.msl
@@ -1,4 +1,4 @@
-// language: metal2.0
+// language: metal1.0
 #include <metal_stdlib>
 #include <simd/simd.h>