nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-25 00:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2203 (#2284)

Browse Source
This commit is contained in:
Rua 2023-08-09 21:25:05 +02:00 committed by GitHub
parent c0379fce96
commit 5ca4805cbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vulkano-shaders/src/entry_point.rs
View File

@ -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,
}
}
},

36
vulkano/src/shader/reflect.rs
View File

@ -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,
};
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));
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