[metal] Unify entry point to create shader module passthrough

Author: syl20bnr

tests/gpu-tests/device.rs

@@ -512,10 +512,13 @@ static DEVICE_DESTROY_THEN_MORE: GpuTestConfiguration = GpuTestConfiguration::ne
             || unsafe {
                 let _ = ctx
                     .device
-                    .create_shader_module_spirv(&wgpu::ShaderModuleDescriptorSpirV {
-                        label: None,
-                        source: std::borrow::Cow::Borrowed(&[]),
-                    });
+                    .create_shader_module_passthrough(
+                        &wgpu::ShaderModuleDescriptorPassthrough::SpirV(
+                            &wgpu::ShaderModuleDescriptorSpirV {
+                                label: None,
+                                source: std::borrow::Cow::Borrowed(&[]),
+                            })
+                        );
             },
             Some("device with '' label is invalid"),
         );

wgpu/src/api/device.rs

@@ -138,35 +138,25 @@ impl Device {
         ShaderModule { inner: module }
     }
 
-    /// Creates a shader module from SPIR-V binary directly.
+    /// Creates a shader module for passthrough to bypass naga and validations.
     ///
     /// # Safety
     ///
-    /// This function passes binary data to the backend as-is and can potentially result in a
-    /// driver crash or bogus behaviour. No attempt is made to ensure that data is valid SPIR-V.
-    ///
-    /// See also [`include_spirv_raw!`] and [`util::make_spirv_raw`].
+    /// This function passes data to the backend as-is and can potentially result in a
+    /// driver crash or bogus behaviour. No attempt is made to ensure that data is valid.
     #[must_use]
-    pub unsafe fn create_shader_module_spirv(
+    pub unsafe fn create_shader_module_passthrough(
         &self,
-        desc: &ShaderModuleDescriptorSpirV<'_>,
+        desc: &ShaderModuleDescriptorPassthrough<'_>,
     ) -> ShaderModule {
-        let module = unsafe { self.inner.create_shader_module_spirv(desc) };
-        ShaderModule { inner: module }
-    }
-
-    /// Creates a shader module from Metal MSL shader directly.
-    ///
-    /// # Safety
-    ///
-    /// This function passes the source to the backend as-is and can potentially result in a
-    /// driver crash or bogus behaviour. No attempt is made to ensure that source code is valid.
-    #[must_use]
-    pub unsafe fn create_shader_module_msl(
-        &self,
-        desc: &ShaderModuleDescriptorMsl<'_>,
-    ) -> ShaderModule {
-        let module = unsafe { self.inner.create_shader_module_msl(desc) };
+        let module = match desc {
+            ShaderModuleDescriptorPassthrough::SpirV(desc) => {
+                unsafe { self.inner.create_shader_module_spirv(desc) }
+            },
+            ShaderModuleDescriptorPassthrough::Msl(desc) => {
+                unsafe { self.inner.create_shader_module_msl(desc) }
+            },
+        };
         ShaderModule { inner: module }
     }
 

wgpu/src/api/shader_module.rs

@@ -223,8 +223,19 @@ pub struct ShaderModuleDescriptor<'a> {
 }
 static_assertions::assert_impl_all!(ShaderModuleDescriptor<'_>: Send, Sync);
 
-/// Descriptor for a shader module given by SPIR-V binary, for use with
-/// [`Device::create_shader_module_spirv`].
+/// Descriptor for a pre-compiled shader module passthrough, for use with
+/// [`Device::create_shader_module_passthrough`].
+///
+/// This type is unique to the Rust API of `wgpu`. In the WebGPU specification,
+/// only WGSL source code strings are accepted.
+pub enum ShaderModuleDescriptorPassthrough<'a> {
+    /// Passthrough for SPIR-V binaries.
+    SpirV(&'a ShaderModuleDescriptorSpirV<'a>),
+    /// Passthrough for MSL source code.
+    Msl(&'a ShaderModuleDescriptorMsl<'a>),
+}
+
+/// Descriptor for a shader module given by SPIR-V binary.
 ///
 /// This type is unique to the Rust API of `wgpu`. In the WebGPU specification,
 /// only WGSL source code strings are accepted.
@@ -237,8 +248,7 @@ pub struct ShaderModuleDescriptorSpirV<'a> {
 }
 static_assertions::assert_impl_all!(ShaderModuleDescriptorSpirV<'_>: Send, Sync);
 
-/// Descriptor for a shader module given by Metal MSL source, for use with
-/// [`Device::create_shader_module_msl`].
+/// Descriptor for a shader module given by Metal MSL source.
 ///
 /// This type is unique to the Rust API of `wgpu`. In the WebGPU specification,
 /// only WGSL source code strings are accepted.