Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
mrk-its committed Oct 16, 2020
1 parent 0e43afb commit b39511a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
7 changes: 2 additions & 5 deletions crates/bevy_render/src/pipeline/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ use super::{
CompareFunction, CullMode, DepthStencilStateDescriptor, FrontFace, IndexFormat,
PrimitiveTopology, RasterizationStateDescriptor, StencilStateFaceDescriptor,
},
PipelineLayout, StencilStateDescriptor
};
use crate::{
shader::ShaderStages,
texture::TextureFormat,
PipelineLayout, StencilStateDescriptor,
};
use crate::{shader::ShaderStages, texture::TextureFormat};

#[derive(Clone, Debug)]
pub struct PipelineDescriptor {
Expand Down
16 changes: 7 additions & 9 deletions crates/bevy_render/src/pipeline/pipeline_compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,13 @@ impl PipelineCompiler {
)
});

specialized_descriptor.layout = Some(
render_resource_context.reflect_pipeline_layout(
&shaders,
&specialized_descriptor.shader_stages,
true,
Some(vertex_buffer_descriptors),
&pipeline_specialization.dynamic_bindings,
)
);
specialized_descriptor.layout = Some(render_resource_context.reflect_pipeline_layout(
&shaders,
&specialized_descriptor.shader_stages,
true,
Some(vertex_buffer_descriptors),
&pipeline_specialization.dynamic_bindings,
));

specialized_descriptor.sample_count = pipeline_specialization.sample_count;
specialized_descriptor.primitive_topology = pipeline_specialization.primitive_topology;
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_render/src/shader/shader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ impl ShaderStages {
fragment: None,
}
}

pub fn iter(&self) -> ShaderStagesIterator {
ShaderStagesIterator {
shader_stages: &self,
Expand Down

0 comments on commit b39511a

Please sign in to comment.