From 46636ed0762736f43f116f78987f3661429432e4 Mon Sep 17 00:00:00 2001 From: "Victor \"multun\" Collod" Date: Tue, 18 Aug 2020 19:48:03 -0700 Subject: [PATCH] fix formatting --- crates/bevy_render/src/shader/shader_reflect.rs | 4 +--- crates/bevy_wgpu/src/wgpu_type_converter.rs | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/crates/bevy_render/src/shader/shader_reflect.rs b/crates/bevy_render/src/shader/shader_reflect.rs index c6aa300d45..c1060c4024 100644 --- a/crates/bevy_render/src/shader/shader_reflect.rs +++ b/crates/bevy_render/src/shader/shader_reflect.rs @@ -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, }] diff --git a/crates/bevy_wgpu/src/wgpu_type_converter.rs b/crates/bevy_wgpu/src/wgpu_type_converter.rs index f8d7bdd657..b62da5ee7c 100644 --- a/crates/bevy_wgpu/src/wgpu_type_converter.rs +++ b/crates/bevy_wgpu/src/wgpu_type_converter.rs @@ -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()