refactor(wgsl-in): factor out wgpu-specific fields of EnableExtensions to new wgpu: WgpuEnableExtensions field

Author: ErichDonGubler

naga/src/front/wgsl/parse/directive/enable_extension.rs

@@ -10,63 +10,54 @@ use alloc::boxed::Box;
 /// Tracks the status of every enable-extension known to Naga.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct EnableExtensions {
-    /// Whether `enable wgpu_mesh_shader;` was written earlier in the shader module.
-    wgpu_mesh_shader: bool,
-    /// Whether `enable wgpu_ray_query;` was written earlier in the shader module.
-    wgpu_ray_query: bool,
-    /// Whether `enable wgpu_ray_query_vertex_return;` was written earlier in the shader module.
-    wgpu_ray_query_vertex_return: bool,
     /// Whether `enable dual_source_blending;` was written earlier in the shader module.
     dual_source_blending: bool,
     /// Whether `enable f16;` was written earlier in the shader module.
     f16: bool,
     /// Whether `enable clip_distances;` was written earlier in the shader module.
     clip_distances: bool,
-    /// Whether `enable wgpu_cooperative_matrix;` was written earlier in the shader module.
-    wgpu_cooperative_matrix: bool,
+    /// Native-only extensions.
+    wgpu: WgpuEnableExtensions,
 }
 
 impl EnableExtensions {
     pub(crate) const fn empty() -> Self {
         Self {
-            wgpu_mesh_shader: false,
-            wgpu_ray_query: false,
-            wgpu_ray_query_vertex_return: false,
+            wgpu: WgpuEnableExtensions::empty(),
             f16: false,
             dual_source_blending: false,
             clip_distances: false,
-            wgpu_cooperative_matrix: false,
         }
     }
 
     /// Add an enable-extension to the set requested by a module.
     pub(crate) fn add(&mut self, ext: ImplementedEnableExtension) {
         let field = match ext {
-            ImplementedEnableExtension::WgpuMeshShader => &mut self.wgpu_mesh_shader,
-            ImplementedEnableExtension::WgpuRayQuery => &mut self.wgpu_ray_query,
+            ImplementedEnableExtension::WgpuMeshShader => &mut self.wgpu.mesh_shader,
+            ImplementedEnableExtension::WgpuRayQuery => &mut self.wgpu.ray_query,
             ImplementedEnableExtension::WgpuRayQueryVertexReturn => {
-                &mut self.wgpu_ray_query_vertex_return
+                &mut self.wgpu.ray_query_vertex_return
             }
             ImplementedEnableExtension::DualSourceBlending => &mut self.dual_source_blending,
             ImplementedEnableExtension::F16 => &mut self.f16,
             ImplementedEnableExtension::ClipDistances => &mut self.clip_distances,
-            ImplementedEnableExtension::WgpuCooperativeMatrix => &mut self.wgpu_cooperative_matrix,
+            ImplementedEnableExtension::WgpuCooperativeMatrix => &mut self.wgpu.cooperative_matrix,
         };
         *field = true;
     }
 
     /// Query whether an enable-extension tracked here has been requested.
     pub(crate) const fn contains(&self, ext: ImplementedEnableExtension) -> bool {
         match ext {
-            ImplementedEnableExtension::WgpuMeshShader => self.wgpu_mesh_shader,
-            ImplementedEnableExtension::WgpuRayQuery => self.wgpu_ray_query,
+            ImplementedEnableExtension::WgpuMeshShader => self.wgpu.mesh_shader,
+            ImplementedEnableExtension::WgpuRayQuery => self.wgpu.ray_query,
             ImplementedEnableExtension::WgpuRayQueryVertexReturn => {
-                self.wgpu_ray_query_vertex_return
+                self.wgpu.ray_query_vertex_return
             }
             ImplementedEnableExtension::DualSourceBlending => self.dual_source_blending,
             ImplementedEnableExtension::F16 => self.f16,
             ImplementedEnableExtension::ClipDistances => self.clip_distances,
-            ImplementedEnableExtension::WgpuCooperativeMatrix => self.wgpu_cooperative_matrix,
+            ImplementedEnableExtension::WgpuCooperativeMatrix => self.wgpu.cooperative_matrix,
         }
     }
 }
@@ -77,6 +68,36 @@ impl Default for EnableExtensions {
     }
 }
 
+/// Native-only extensions under [`EnableExtensions::wgpu`].
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct WgpuEnableExtensions {
+    /// Whether `enable wgpu_mesh_shader;` was written earlier in the shader module.
+    mesh_shader: bool,
+    /// Whether `enable wgpu_ray_query;` was written earlier in the shader module.
+    ray_query: bool,
+    /// Whether `enable wgpu_ray_query_vertex_return;` was written earlier in the shader module.
+    ray_query_vertex_return: bool,
+    /// Whether `enable wgpu_cooperative_matrix;` was written earlier in the shader module.
+    cooperative_matrix: bool,
+}
+
+impl WgpuEnableExtensions {
+    pub(crate) const fn empty() -> Self {
+        Self {
+            mesh_shader: false,
+            ray_query: false,
+            ray_query_vertex_return: false,
+            cooperative_matrix: false,
+        }
+    }
+}
+
+impl Default for WgpuEnableExtensions {
+    fn default() -> Self {
+        Self::empty()
+    }
+}
+
 /// An enable-extension not guaranteed to be present in all environments.
 ///
 /// WGSL spec.: <https://www.w3.org/TR/WGSL/#enable-extensions-sec>