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

Fix #2398 (#2402)

Browse Source
This commit is contained in:
Rua 2023-11-11 22:49:49 +01:00 committed by GitHub
parent 34736a675a
commit df302d8f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -845,29 +845,44 @@ fn descriptor_binding_requirements_of(spirv: &Spirv, variable_id: Id) -> Descrip
fn push_constant_requirements(spirv: &Spirv, stage: ShaderStage) -> Option<PushConstantRange> {
spirv
.iter_global()
// TODO: doesn't work with more than one entry point in the shader.
// We should really use the interface variables in Instruction::EntryPoint,
// but before SPIR-V 1.4 these do not contain push constants.
.find_map(|instruction| match *instruction {
Instruction::TypePointer {
ty,
Instruction::Variable {
result_type_id,
storage_class: StorageClass::PushConstant,
..
} => {
let id_info = spirv.id(ty);
assert!(matches!(
id_info.instruction(),
Instruction::TypeStruct { .. }
));
let start = offset_of_struct(spirv, ty);
let end =
size_of_type(spirv, ty).expect("Found runtime-sized push constants") as u32;
Some(PushConstantRange {
stages: stage.into(),
offset: start,
size: end - start,
})
}
} => Some(result_type_id),
_ => None,
})
.map(|pointer_type_id| {
let struct_type_id = match *spirv.id(pointer_type_id).instruction() {
Instruction::TypePointer {
ty,
storage_class: StorageClass::PushConstant,
..
} => ty,
_ => unreachable!(),
};
assert!(
matches!(
spirv.id(struct_type_id).instruction(),
Instruction::TypeStruct { .. }
),
"VUID-StandaloneSpirv-PushConstant-06808"
);
let start = offset_of_struct(spirv, struct_type_id);
let end = size_of_type(spirv, struct_type_id)
.expect("Found runtime-sized push constants") as u32;
PushConstantRange {
stages: stage.into(),
offset: start,
size: end - start,
}
})
}
/// Extracts the `SpecializationConstant` map from `spirv`.