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 08:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for SSBOs in shader analyzer

Browse Source
This commit is contained in:
Pierre Krieger 2016-03-29 14:11:11 +02:00
parent 504839c11a
commit 0143111858
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vulkano-shaders/src/descriptor_sets.rs
View File

@ -62,12 +62,33 @@ pub fn write_descriptor_sets(doc: &parse::Spirv) -> String {
&parse::Instruction::TypeStruct { result_id, .. } if result_id == pointed_ty => { &parse::Instruction::TypeStruct { result_id, .. } if result_id == pointed_ty => {
let tp_buffer = template_params.next().unwrap(); let tp_buffer = template_params.next().unwrap();
// Determine whether there's a Block or BufferBlock decoration.
let is_ssbo = doc.instructions.iter().filter_map(|i| {
match i {
&parse::Instruction::Decorate { target_id, decoration: enums::Decoration::DecorationBufferBlock, .. } if target_id == pointed_ty => {
Some(true)
},
&parse::Instruction::Decorate { target_id, decoration: enums::Decoration::DecorationBlock, .. } if target_id == pointed_ty => {
Some(false)
},
_ => None,
}
}).next().expect("Found a buffer uniform with neither the Block nor BufferBlock decorations");
Some(( Some((
"::vulkano::descriptor_set::DescriptorType::UniformBuffer", if !is_ssbo {
"::vulkano::descriptor_set::DescriptorType::UniformBuffer"
} else {
"::vulkano::descriptor_set::DescriptorType::StorageBuffer"
},
vec![tp_buffer.to_owned()], vec![tp_buffer.to_owned()],
format!("{}: 'static + ::vulkano::buffer::TypedBuffer", tp_buffer), format!("{}: 'static + ::vulkano::buffer::TypedBuffer", tp_buffer),
format!("&'a ::std::sync::Arc<{}>", tp_buffer), format!("&'a ::std::sync::Arc<{}>", tp_buffer),
"::vulkano::descriptor_set::DescriptorBind::uniform_buffer(data)" if !is_ssbo {
"::vulkano::descriptor_set::DescriptorBind::uniform_buffer(data)"
} else {
"::vulkano::descriptor_set::DescriptorBind::storage_buffer(data)"
}
)) ))
}, },
&parse::Instruction::TypeImage { result_id, sampled_type_id, ref dim, arrayed, ms, &parse::Instruction::TypeImage { result_id, sampled_type_id, ref dim, arrayed, ms,