Skip to content

Commit

Permalink
Merge pull request bevyengine#234 from multun/fix-formatting
Browse files Browse the repository at this point in the history
fix formatting
  • Loading branch information
cart authored Aug 19, 2020
2 parents 6ffe069 + 46636ed commit 7d1d9dc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 1 addition & 3 deletions crates/bevy_render/src/shader/shader_reflect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -412,9 +412,7 @@ mod tests {
name: "Camera".into(),
bind_type: BindType::Uniform {
dynamic: false,
property: UniformProperty::Struct(vec![
UniformProperty::Mat4
]),
property: UniformProperty::Struct(vec![UniformProperty::Mat4]),
},
shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
}]
Expand Down
5 changes: 1 addition & 4 deletions crates/bevy_wgpu/src/wgpu_type_converter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@ where
impl WgpuFrom<&BindType> for wgpu::BindingType {
fn from(bind_type: &BindType) -> Self {
match bind_type {
BindType::Uniform {
dynamic,
..
} => wgpu::BindingType::UniformBuffer {
BindType::Uniform { dynamic, .. } => wgpu::BindingType::UniformBuffer {
dynamic: *dynamic,
min_binding_size: bind_type
.get_uniform_size()
Expand Down

0 comments on commit 7d1d9dc

Please sign in to comment.