SYNC POINT: resolve merge conflicts

Author: ErichDonGubler

CHANGELOG.md

@@ -42,6 +42,12 @@ Bottom level categories:
 
 ## Unreleased
 
+### Added/New Features
+
+#### Metal
+
+- Unconditionally enable `Features::CLIP_DISTANCES`. By @ErichDonGubler in [#????](https://github.com/gfx-rs/wgpu/pull/????).
+
 ### Changes
 
 #### General

naga/src/back/msl/mod.rs

@@ -841,7 +841,7 @@ pub fn supported_capabilities() -> crate::valid::Capabilities {
         // No BUFFER_BINDING_ARRAY
         | Caps::STORAGE_TEXTURE_BINDING_ARRAY
         | Caps::STORAGE_BUFFER_BINDING_ARRAY
-        | Caps::CLIP_DISTANCES // CLIP_DISTANCES isn't supported by metal backend? But is supported by MSL writer
+        | Caps::CLIP_DISTANCES
         // No CULL_DISTANCE
         | Caps::STORAGE_TEXTURE_16BIT_NORM_FORMATS
         | Caps::MULTIVIEW

naga/src/back/msl/writer.rs

@@ -7190,10 +7190,19 @@ template <typename A>
                         };
                         let resolved = options.resolve_local_binding(binding, out_mode)?;
                         write!(self.out, "{}{} {}", back::INDENT, ty_name, name)?;
+                        let binding_attr_comes_before_array = matches!(
+                            resolved,
+                            super::ResolvedBinding::BuiltIn(crate::BuiltIn::ClipDistances)
+                        );
+                        if binding_attr_comes_before_array {
+                            resolved.try_fmt(&mut self.out)?;
+                        }
                         if let Some(array_len) = array_len {
                             write!(self.out, " [{array_len}]")?;
                         }
-                        resolved.try_fmt(&mut self.out)?;
+                        if !binding_attr_comes_before_array {
+                            resolved.try_fmt(&mut self.out)?;
+                        }
                         writeln!(self.out, ";")?;
                     }
 

naga/tests/in/wgsl/clip-distances.toml

@@ -1,5 +1,5 @@
 capabilities = "CLIP_DISTANCES"
-targets = "SPIRV | GLSL | WGSL"
+targets = "SPIRV | GLSL | WGSL | METAL"
 
 [glsl]
 version.Desktop = 330

naga/tests/out/msl/wgsl-clip-distances.metal

@@ -0,0 +1,27 @@
+// language: metal1.0
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using metal::uint;
+
+struct type_2 {
+    float inner[1];
+};
+struct VertexOutput {
+    metal::float4 position;
+    type_2 clip_distances;
+    char _pad2[12];
+};
+
+struct main_Output {
+    metal::float4 position [[position]];
+    float clip_distances [[clip_distance]] [1];
+};
+vertex main_Output main_(
+) {
+    VertexOutput out = {};
+    out.clip_distances.inner[0] = 0.5;
+    VertexOutput _e4 = out;
+    const auto _tmp = _e4;
+    return main_Output { _tmp.position, {_tmp.clip_distances.inner[0]} };
+}

wgpu-hal/src/metal/adapter.rs

@@ -1094,6 +1094,7 @@ impl super::CapabilitiesQuery {
             self.timestamp_query_support
                 .contains(TimestampQuerySupport::INSIDE_WGPU_PASSES),
         );
+        features.set(F::CLIP_DISTANCES, true);
         features.set(
             F::DUAL_SOURCE_BLENDING,
             self.msl_version >= MTLLanguageVersion::Version1_2 && self.dual_source_blending,