diff options
Diffstat (limited to 'src/graphics/model.rs')
| -rw-r--r-- | src/graphics/model.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/graphics/model.rs b/src/graphics/model.rs index 7b912b6..9c62d51 100644 --- a/src/graphics/model.rs +++ b/src/graphics/model.rs @@ -1,7 +1,6 @@ #![deny(unsafe_code)] use crate::error::*; -use crate::graphics::permanent::PermanentGraphicsState; -use crate::graphics::render_state::RenderState; +use crate::graphics::{ Permanent, Render }; use crate::graphics::util::init_buffer; use crate::linear_algebra::{ Vec3, Vec4, Transformation }; use crate::shader_data::{ Vertex, VertexPushBlock }; @@ -25,7 +24,7 @@ pub struct Model { impl Model { pub fn new(vertices: Vec<Vertex<f32>>, indices: Vec<u32>, - permanent: &PermanentGraphicsState) + permanent: &Permanent) -> Result<Self> { let device = &permanent.device; @@ -61,7 +60,7 @@ impl Model { } #[allow(unsafe_code)] - pub fn render(&self, time: f32, device: &Device, render_state: &RenderState, + pub fn render(&self, time: f32, device: &Device, render: &Render, command_buffer: &vk::CommandBuffer, descriptor_set: &vk::DescriptorSet) { @@ -78,7 +77,7 @@ impl Model { unsafe { device.cmd_bind_descriptor_sets(*command_buffer, vk::PipelineBindPoint::GRAPHICS, - render_state.pipeline_layout, + render.pipeline_layout, 0, &[*descriptor_set], &[]) @@ -99,7 +98,7 @@ impl Model { }; unsafe { - device.cmd_push_constants(*command_buffer, render_state.pipeline_layout, + device.cmd_push_constants(*command_buffer, render.pipeline_layout, vk::ShaderStageFlags::VERTEX, 0, push_block_bytes) |