diff options
Diffstat (limited to 'src/graphics/scene.rs')
| -rw-r--r-- | src/graphics/scene.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/graphics/scene.rs b/src/graphics/scene.rs index f1399b2..874e9ea 100644 --- a/src/graphics/scene.rs +++ b/src/graphics/scene.rs @@ -1,6 +1,6 @@ #![deny(unsafe_code)] use crate::error::*; -use crate::graphics::render_state::RenderState; +use crate::graphics::Render; use vulkanalia::Device; use vulkanalia::vk::{ self, HasBuilder, DeviceV1_0 }; @@ -8,13 +8,13 @@ use vulkanalia::vk::{ self, HasBuilder, DeviceV1_0 }; #[allow(unsafe_code)] pub fn generate_scene_commands<'a>(image_index: usize, time: f32, - render_state: &'a RenderState, + render: &'a Render, device: &Device, extent: &vk::Extent2D) -> Result<&'a vk::CommandBuffer> { - let command_buffer = &render_state.command_buffers[image_index]; - let framebuffer = &render_state.framebuffers[image_index]; - let descriptor_set = &render_state.descriptor_sets[image_index]; + let command_buffer = &render.command_buffers[image_index]; + let framebuffer = &render.framebuffers[image_index]; + let descriptor_set = &render.descriptor_sets[image_index]; let inheritance_info = vk::CommandBufferInheritanceInfo::builder(); @@ -44,7 +44,7 @@ pub fn generate_scene_commands<'a>(image_index: usize, time: f32, let clear_values = [color_clear_value, depth_clear_value]; let begin_pass_info = vk::RenderPassBeginInfo::builder() - .render_pass(render_state.render_pass) + .render_pass(render.render_pass) .framebuffer(*framebuffer) .render_area(render_area) .clear_values(&clear_values); @@ -57,11 +57,11 @@ pub fn generate_scene_commands<'a>(image_index: usize, time: f32, unsafe { device.cmd_bind_pipeline(*command_buffer, vk::PipelineBindPoint::GRAPHICS, - render_state.pipeline) + render.pipeline) }; - if let Some(model) = &render_state.model { - model.render(time, device, render_state, command_buffer, descriptor_set); + if let Some(model) = &render.model { + model.render(time, device, render, command_buffer, descriptor_set); } unsafe { device.cmd_end_render_pass(*command_buffer) }; |