Adds BuiltIn::NumSubgroups, BuiltIn::SubgroupId.

gfx-rs · Oct 14, 2023 · 7008d27 · 7008d27
1 parent f806246
commit 7008d27
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/src/back/glsl/mod.rs b/src/back/glsl/mod.rs
@@ -4205,6 +4205,7 @@ const fn glsl_built_in(
         Bi::WorkGroupSize => "gl_WorkGroupSize",
         Bi::NumWorkGroups => "gl_NumWorkGroups",
         // subgroup
+        Bi::NumSubgroups | Bi::SubgroupId => todo!(),
         Bi::SubgroupInvocationId => "gl_SubgroupInvocationID",
         Bi::SubgroupSize => "gl_SubgroupSize",
     }

diff --git a/src/back/hlsl/conv.rs b/src/back/hlsl/conv.rs
@@ -167,6 +167,7 @@ impl crate::BuiltIn {
             // in `Writer::write_expr`.
             Self::NumWorkGroups => "SV_GroupID",
 
+            Self::NumSubgroups | Self::SubgroupId => todo!(),
             Self::SubgroupInvocationId
             | Self::SubgroupSize
             | Self::BaseInstance

diff --git a/src/back/msl/mod.rs b/src/back/msl/mod.rs
@@ -412,6 +412,7 @@ impl ResolvedBinding {
                     Bi::WorkGroupSize => "dispatch_threads_per_threadgroup",
                     Bi::NumWorkGroups => "threadgroups_per_grid",
                     // subgroup
+                    Bi::NumSubgroups | Bi::SubgroupId => todo!(),
                     Bi::SubgroupInvocationId => "simdgroup_index_in_threadgroup",
                     Bi::SubgroupSize => "simdgroups_per_threadgroup",
                     Bi::CullDistance | Bi::ViewIndex => {

diff --git a/src/back/spv/writer.rs b/src/back/spv/writer.rs
@@ -1594,6 +1594,7 @@ impl Writer {
                     Bi::WorkGroupSize => BuiltIn::WorkgroupSize,
                     Bi::NumWorkGroups => BuiltIn::NumWorkgroups,
                     // Subgroup
+                    Bi::NumSubgroups | Bi::SubgroupId => todo!(),
                     Bi::SubgroupInvocationId => {
                         self.require_any(
                             "`subgroup_invocation_id` built-in",

diff --git a/src/back/wgsl/writer.rs b/src/back/wgsl/writer.rs
@@ -1794,6 +1794,7 @@ fn builtin_str(built_in: crate::BuiltIn) -> Result<&'static str, Error> {
         Bi::SampleMask => "sample_mask",
         Bi::PrimitiveIndex => "primitive_index",
         Bi::ViewIndex => "view_index",
+        Bi::NumSubgroups | Bi::SubgroupId => todo!(),
         Bi::SubgroupInvocationId => "subgroup_invocation_id",
         Bi::SubgroupSize => "subgroup_size",
         Bi::BaseInstance

diff --git a/src/lib.rs b/src/lib.rs
@@ -436,6 +436,8 @@ pub enum BuiltIn {
     WorkGroupSize,
     NumWorkGroups,
     // subgroup
+    NumSubgroups,
+    SubgroupId,
     SubgroupSize,
     SubgroupInvocationId,
 }

diff --git a/src/valid/interface.rs b/src/valid/interface.rs
@@ -299,15 +299,15 @@ impl VaryingContext<'_> {
                                 width,
                             },
                     ),
-                    Bi::SubgroupInvocationId => (
+                    Bi::NumSubgroups | Bi::SubgroupId => (
                         self.stage == St::Compute && !self.output,
                         *ty_inner
                             == Ti::Scalar {
                                 kind: Sk::Uint,
                                 width,
                             },
                     ),
-                    Bi::SubgroupSize => (
+                    Bi::SubgroupSize | Bi::SubgroupInvocationId => (
                         match self.stage {
                             St::Compute | St::Fragment => !self.output,
                             St::Vertex => false,