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 22:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some work on SPIR-V analyser

Browse Source
This commit is contained in:
Pierre Krieger 2016-02-20 18:26:51 +01:00
parent 28f7d88197
commit e12c3015e7
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vulkano-shaders/src/lib.rs
View File

@ -16,6 +16,9 @@ pub fn reflect<R>(name: &str, mut spirv: R) -> Result<String, Error>
// now parsing the document
let doc = try!(parse::parse_spirv(&data));
// TODO: remove
println!("{:#?}", doc);
let mut output = String::new();
{
@ -87,9 +90,6 @@ impl {name} {{
output.push_str(&write_descriptor_sets(&doc));
}
// TODO: remove
println!("{:#?}", doc);
Ok(output)
}
@ -261,7 +261,7 @@ fn write_descriptor_sets(doc: &parse::Spirv) -> String {
},
_ => None, // TODO: other types
}
}).next().expect("a uniform is missing a binding");
}).next().expect("A uniform is missing a binding");
// find informations about the kind of binding for this descriptor
let (desc_ty, bind_ty, bind) = doc.instructions.iter().filter_map(|i| {
@ -273,9 +273,28 @@ fn write_descriptor_sets(doc: &parse::Spirv) -> String {
"::vulkano::descriptor_set::DescriptorBind::UniformBuffer"
))
},
&parse::Instruction::TypeImage { result_id, sampled_type_id, ref dim, arrayed, ms,
sampled, ref format, ref access, .. }
if result_id == pointed_ty && sampled == Some(true) =>
{
Some((
"::vulkano::descriptor_set::DescriptorType::SampledImage",
"::vulkano::image::ImageResource",
"::vulkano::descriptor_set::DescriptorBind::UniformBuffer" // FIXME:
))
},
&parse::Instruction::TypeSampledImage { result_id, image_type_id }
if result_id == pointed_ty =>
{
Some((
"::vulkano::descriptor_set::DescriptorType::SampledImage",
"::vulkano::image::ImageResource",
"::vulkano::descriptor_set::DescriptorBind::UniformBuffer" // FIXME:
))
},
_ => None, // TODO: other types
}
}).next().unwrap();
}).next().expect(&format!("Couldn't find relevant type for uniform `{}` (maybe unimplemented)", name));
descriptors.push(Descriptor {
name: name,