[spv-in] Fix OpImageQueries to allow Uints

gfx-rs · Jul 10, 2023 · 5a0c47e · 5a0c47e
1 parent 04ef22f
commit 5a0c47e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/src/front/spv/image.rs b/src/front/spv/image.rs
@@ -1,4 +1,4 @@
-use crate::arena::{Arena, Handle, UniqueArena};
+use crate::arena::{Handle, UniqueArena};
 
 use super::{Error, LookupExpression, LookupHelper as _};
 
@@ -666,6 +666,7 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
     ) -> Result<(), Error> {
         let start = self.data_offset;
         let result_type_id = self.next()?;
+        let result_type = self.lookup_type.lookup(result_type_id)?.handle;
         let result_id = self.next()?;
         let image_id = self.next()?;
         let level = if at_level {
@@ -685,10 +686,16 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
             image: image_lexp.handle,
             query: crate::ImageQuery::Size { level },
         };
-        let expr = crate::Expression::As {
-            expr: ctx.expressions.append(expr, self.span_from_with_op(start)),
-            kind: crate::ScalarKind::Sint,
-            convert: Some(4),
+        let expr = if let Some(crate::ScalarKind::Sint) =
+            ctx.type_arena[result_type].inner.scalar_kind()
+        {
+            crate::Expression::As {
+                expr: ctx.expressions.append(expr, self.span_from_with_op(start)),
+                kind: crate::ScalarKind::Sint,
+                convert: Some(4),
+            }
+        } else {
+            expr
         };
         self.lookup_expression.insert(
             result_id,
@@ -704,11 +711,12 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
     pub(super) fn parse_image_query_other(
         &mut self,
         query: crate::ImageQuery,
-        expressions: &mut Arena<crate::Expression>,
+        ctx: &mut super::BlockContext,
         block_id: spirv::Word,
     ) -> Result<(), Error> {
         let start = self.data_offset;
         let result_type_id = self.next()?;
+        let result_type = self.lookup_type.lookup(result_type_id)?.handle;
         let result_id = self.next()?;
         let image_id = self.next()?;
 
@@ -720,15 +728,21 @@ impl<I: Iterator<Item = u32>> super::Frontend<I> {
             image: image_lexp.handle,
             query,
         };
-        let expr = crate::Expression::As {
-            expr: expressions.append(expr, self.span_from_with_op(start)),
-            kind: crate::ScalarKind::Sint,
-            convert: Some(4),
+        let expr = if let Some(crate::ScalarKind::Sint) =
+            ctx.type_arena[result_type].inner.scalar_kind()
+        {
+            crate::Expression::As {
+                expr: ctx.expressions.append(expr, self.span_from_with_op(start)),
+                kind: crate::ScalarKind::Sint,
+                convert: Some(4),
+            }
+        } else {
+            expr
         };
         self.lookup_expression.insert(
             result_id,
             LookupExpression {
-                handle: expressions.append(expr, self.span_from_with_op(start)),
+                handle: ctx.expressions.append(expr, self.span_from_with_op(start)),
                 type_id: result_type_id,
                 block_id,
             },

diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs
@@ -2686,19 +2686,11 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
                 }
                 Op::ImageQueryLevels => {
                     inst.expect(4)?;
-                    self.parse_image_query_other(
-                        crate::ImageQuery::NumLevels,
-                        ctx.expressions,
-                        block_id,
-                    )?;
+                    self.parse_image_query_other(crate::ImageQuery::NumLevels, ctx, block_id)?;
                 }
                 Op::ImageQuerySamples => {
                     inst.expect(4)?;
-                    self.parse_image_query_other(
-                        crate::ImageQuery::NumSamples,
-                        ctx.expressions,
-                        block_id,
-                    )?;
+                    self.parse_image_query_other(crate::ImageQuery::NumSamples, ctx, block_id)?;
                 }
                 // other ops
                 Op::Select => {