diff options
Diffstat (limited to 'engine/src/rendering/main_render_pass.rs')
| -rw-r--r-- | engine/src/rendering/main_render_pass.rs | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/engine/src/rendering/main_render_pass.rs b/engine/src/rendering/main_render_pass.rs index b318f1a..60bed03 100644 --- a/engine/src/rendering/main_render_pass.rs +++ b/engine/src/rendering/main_render_pass.rs @@ -9,7 +9,6 @@ use crate::ecs::Query; use crate::error; use crate::model::{MaterialSearchResult, Model}; use crate::rendering::object::{Id as ObjectId, Store as ObjectStore}; -use crate::rendering::shader::cursor::Binding as ShaderBinding; use crate::rendering::shader::default::ASSET_LABEL as DEFAULT_SHADER_ASSET_LABEL; use crate::rendering::shader::{ Context as ShaderContext, @@ -184,33 +183,22 @@ pub fn add_main_render_passes( } } - for ShaderBinding { - location: shader_binding_loc, - value: shader_binding_val, - } in &pending_shader_bindings.bindings - { - render_pass.commands.push(Command::SetShaderBinding( - shader_binding_loc.clone(), - shader_binding_val.clone(), - )); + for shader_binding in &pending_shader_bindings.bindings { + render_pass + .commands + .push(Command::SetShaderBinding(shader_binding.clone())); } - for ( - shader_binding_surface_id, - ShaderBinding { - location: shader_binding_loc, - value: shader_binding_val, - }, - ) in &pending_shader_bindings.surface_specific_bindings + for (shader_binding_surface_id, shader_binding) in + &pending_shader_bindings.surface_specific_bindings { if *shader_binding_surface_id != surface_spec.id { continue; } - render_pass.commands.push(Command::SetShaderBinding( - shader_binding_loc.clone(), - shader_binding_val.clone(), - )); + render_pass + .commands + .push(Command::SetShaderBinding(shader_binding.clone())); } if let Some(draw_flags) = draw_flags.as_deref().and_then(|draw_flags| { |