Adds GatherMode::Shuffle, GatherMode::ShuffleDown, GatherMode::Shuffl…

…eUp, GatherMode::ShuffleXor.
gfx-rs · Oct 14, 2023 · b41cce8 · b41cce8
1 parent 7008d27
commit b41cce8
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/src/back/spv/subgroup.rs b/src/back/spv/subgroup.rs
@@ -132,6 +132,10 @@ impl<'w> BlockContext<'w> {
                         arg_id,
                     ));
             }
+            crate::GatherMode::Shuffle(index)
+            | crate::GatherMode::ShuffleDown(index)
+            | crate::GatherMode::ShuffleUp(index)
+            | crate::GatherMode::ShuffleXor(index) => todo!(),
         }
         self.cached[result] = id;
         Ok(())

diff --git a/src/compact/statements.rs b/src/compact/statements.rs
@@ -117,7 +117,11 @@ impl FunctionTracer<'_> {
                     } => {
                         match mode {
                             crate::GatherMode::BroadcastFirst => {}
-                            crate::GatherMode::Broadcast(index) => self.trace_expression(index),
+                            crate::GatherMode::Broadcast(index)
+                            | crate::GatherMode::Shuffle(index)
+                            | crate::GatherMode::ShuffleDown(index)
+                            | crate::GatherMode::ShuffleUp(index)
+                            | crate::GatherMode::ShuffleXor(index) => self.trace_expression(index),
                         }
                         self.trace_expression(argument);
                         self.trace_expression(result);
@@ -296,7 +300,11 @@ impl FunctionMap {
                     } => {
                         match *mode {
                             crate::GatherMode::BroadcastFirst => {}
-                            crate::GatherMode::Broadcast(ref mut index) => adjust(index),
+                            crate::GatherMode::Broadcast(ref mut index)
+                            | crate::GatherMode::Shuffle(ref mut index)
+                            | crate::GatherMode::ShuffleDown(ref mut index)
+                            | crate::GatherMode::ShuffleUp(ref mut index)
+                            | crate::GatherMode::ShuffleXor(ref mut index) => adjust(index),
                         }
                         adjust(argument);
                         adjust(result);

diff --git a/src/lib.rs b/src/lib.rs
@@ -1271,6 +1271,10 @@ pub enum SwizzleComponent {
 pub enum GatherMode {
     BroadcastFirst,
     Broadcast(Handle<Expression>),
+    Shuffle(Handle<Expression>),
+    ShuffleDown(Handle<Expression>),
+    ShuffleUp(Handle<Expression>),
+    ShuffleXor(Handle<Expression>),
 }
 
 #[derive(Clone, Copy, Debug, Hash, Eq, Ord, PartialEq, PartialOrd)]

diff --git a/src/valid/analyzer.rs b/src/valid/analyzer.rs
@@ -1015,8 +1015,15 @@ impl FunctionInfo {
                     result: _,
                 } => {
                     let _ = self.add_ref(argument);
-                    if let crate::GatherMode::Broadcast(expr) = mode {
-                        let _ = self.add_ref(expr);
+                    match mode {
+                        crate::GatherMode::BroadcastFirst => {}
+                        crate::GatherMode::Broadcast(index)
+                        | crate::GatherMode::Shuffle(index)
+                        | crate::GatherMode::ShuffleDown(index)
+                        | crate::GatherMode::ShuffleUp(index)
+                        | crate::GatherMode::ShuffleXor(index) => {
+                            let _ = self.add_ref(index);
+                        }
                     }
                     FunctionUniformity::new()
                 }

diff --git a/src/valid/function.rs b/src/valid/function.rs
@@ -485,7 +485,11 @@ impl super::Validator {
     ) -> Result<(), WithSpan<FunctionError>> {
         match *mode {
             crate::GatherMode::BroadcastFirst => {}
-            crate::GatherMode::Broadcast(index) => {
+            crate::GatherMode::Broadcast(index)
+            | crate::GatherMode::Shuffle(index)
+            | crate::GatherMode::ShuffleDown(index)
+            | crate::GatherMode::ShuffleUp(index)
+            | crate::GatherMode::ShuffleXor(index) => {
                 let index_ty = context.resolve_type(index, &self.valid_expression_set)?;
                 match *index_ty {
                     crate::TypeInner::Scalar {

diff --git a/src/valid/handles.rs b/src/valid/handles.rs
@@ -564,7 +564,11 @@ impl super::Validator {
                 validate_expr(argument)?;
                 match mode {
                     crate::GatherMode::BroadcastFirst => {}
-                    crate::GatherMode::Broadcast(index) => validate_expr(index)?,
+                    crate::GatherMode::Broadcast(index)
+                    | crate::GatherMode::Shuffle(index)
+                    | crate::GatherMode::ShuffleDown(index)
+                    | crate::GatherMode::ShuffleUp(index)
+                    | crate::GatherMode::ShuffleXor(index) => validate_expr(index)?,
                 }
                 validate_expr(result)?;
                 Ok(())