Fix #2203

vulkano-rs · Aug 9, 2023 · 6233ba0 · 6233ba0
1 parent db0b02a
commit 6233ba0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/vulkano-shaders/src/entry_point.rs b/vulkano-shaders/src/entry_point.rs
@@ -299,6 +299,11 @@ fn write_interface(interface: &ShaderInterface) -> TokenStream {
              name,
          }| {
             let base_type = format_ident!("{}", format!("{:?}", base_type));
+            let name = if let Some(name) = name {
+                quote! { ::std::option::Option::Some(::std::borrow::Cow::Borrowed(#name)) }
+            } else {
+                quote! { ::std::option::Option::None }
+            };
 
             quote! {
                 ::vulkano::shader::ShaderInterfaceEntry {
@@ -310,7 +315,7 @@ fn write_interface(interface: &ShaderInterface) -> TokenStream {
                         num_elements: #num_elements,
                         is_64bit: #is_64bit,
                     },
-                    name: ::std::option::Option::Some(::std::borrow::Cow::Borrowed(#name)),
+                    name: #name,
                 }
             }
         },

diff --git a/vulkano/src/shader/reflect.rs b/vulkano/src/shader/reflect.rs
@@ -264,7 +264,7 @@ fn inspect_entry_point(
             chain: [fn(&Spirv, Id) -> Option<Id>; N],
             id: Id,
         ) -> Option<(&mut DescriptorBindingVariable, Option<u32>)> {
-            let id = chain
+            let mut id = chain
                 .into_iter()
                 .try_fold(id, |id, func| func(self.spirv, id))?;
 
@@ -275,24 +275,24 @@ fn inspect_entry_point(
                 return Some((variable, Some(0)));
             }
 
-            let (id, indexes) = match *self.spirv.id(id).instruction() {
-                Instruction::AccessChain {
-                    base, ref indexes, ..
-                } => (base, indexes),
-                _ => return None,
-            };
-
-            if let Some(variable) = self.global.get(&id) {
-                // Variable was accessed with an access chain.
-                // Retrieve index from instruction if it's a constant value.
-                // TODO: handle a `None` index too?
-                let index = match *self.spirv.id(*indexes.first().unwrap()).instruction() {
-                    Instruction::Constant { ref value, .. } => Some(value[0]),
-                    _ => None,
-                };
-                let variable = self.result.entry(id).or_insert_with(|| variable.clone());
-                variable.reqs.stages = self.stage.into();
-                return Some((variable, index));
+            while let Instruction::AccessChain {
+                base, ref indexes, ..
+            } = *self.spirv.id(id).instruction()
+            {
+                id = base;
+
+                if let Some(variable) = self.global.get(&id) {
+                    // Variable was accessed with an access chain.
+                    // Retrieve index from instruction if it's a constant value.
+                    // TODO: handle a `None` index too?
+                    let index = match *self.spirv.id(*indexes.first().unwrap()).instruction() {
+                        Instruction::Constant { ref value, .. } => Some(value[0]),
+                        _ => None,
+                    };
+                    let variable = self.result.entry(id).or_insert_with(|| variable.clone());
+                    variable.reqs.stages = self.stage.into();
+                    return Some((variable, index));
+                }
             }
 
             None