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

Parsed structs are now part of a ty submodule

Browse Source
This commit is contained in:
Pierre Krieger 2016-03-05 13:31:44 +01:00
parent 82e7eab532
commit 1d40c8edc3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,9 @@ impl {name} {{
"#));
// struct definitions
output.push_str("pub mod ty {");
output.push_str(&structs::write_structs(&doc));
output.push_str("}");
// descriptor sets
output.push_str(&descriptor_sets::write_descriptor_sets(&doc));

4
vulkano/examples/teapot.rs
View File

@ -112,7 +112,7 @@ fn main() {
let view = cgmath::Matrix4::look_at(cgmath::Point3::new(0.3, 0.3, 1.0), cgmath::Point3::new(0.0, 0.0, 0.0), cgmath::Vector3::new(0.0, -1.0, 0.0));
let scale = cgmath::Matrix4::from_scale(0.01);
let uniform_buffer = vulkano::buffer::Buffer::<vs::Data, _>
let uniform_buffer = vulkano::buffer::Buffer::<vs::ty::Data, _>
::new(&device, &vulkano::buffer::Usage::all(),
vulkano::memory::HostVisible, &queue)
.expect("failed to create buffer");
@ -188,7 +188,7 @@ fn main() {
vulkano::pipeline::GraphicsPipeline::new(&device, &vs.main_entry_point(), &ia, &viewports,
&raster, &ms, &blend, &fs.main_entry_point(),
&pipeline_layout, renderpass.subpass(0).unwrap())
&pipeline_layout, vulkano::framebuffer::Subpass::from(&renderpass, 0).unwrap())
.unwrap()
};