diff --git a/naga/src/back/spv/block.rs b/naga/src/back/spv/block.rs index 7c0bce20d..5c0b70b1e 100644 --- a/naga/src/back/spv/block.rs +++ b/naga/src/back/spv/block.rs @@ -1721,14 +1721,9 @@ impl<'w> BlockContext<'w> { let resolution = &self.fun_info[expr_handle].ty; match type_adjustment { AccessTypeAdjustment::None => self.writer.get_expression_type_id(resolution), - AccessTypeAdjustment::IntroducePointer(class) => match *resolution { - TypeResolution::Handle(handle) => self.writer.get_pointer_id(handle, class), - TypeResolution::Value(_) => { - unreachable!( - "IntroducePointer should only be used with images and samplers" - ); - } - }, + AccessTypeAdjustment::IntroducePointer(class) => { + self.writer.get_resolution_pointer_id(resolution, class) + } } }; diff --git a/naga/src/back/spv/writer.rs b/naga/src/back/spv/writer.rs index 57beb4535..b12e745d3 100644 --- a/naga/src/back/spv/writer.rs +++ b/naga/src/back/spv/writer.rs @@ -274,6 +274,24 @@ impl Writer { })) } + /// Return a SPIR-V type for a pointer to `resolution`. + /// + /// The given `resolution` must be one that we can represent + /// either as a `LocalType::Pointer` or `LocalType::LocalPointer`. + pub(super) fn get_resolution_pointer_id( + &mut self, + resolution: &TypeResolution, + class: spirv::StorageClass, + ) -> Word { + match *resolution { + TypeResolution::Handle(handle) => self.get_pointer_id(handle, class), + TypeResolution::Value(ref inner) => { + let base = NumericType::from_inner(inner).unwrap(); + self.get_type_id(LookupType::Local(LocalType::LocalPointer { base, class })) + } + } + } + pub(super) fn get_uint_type_id(&mut self) -> Word { let local_type = LocalType::Numeric(NumericType::Scalar(crate::Scalar::U32)); self.get_type_id(local_type.into())