forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #234 from multun/fix-formatting

Browse Source 
fix formatting
This commit is contained in:
Carter Anderson 2020-08-18 20:42:13 -07:00 committed by GitHub
commit 7d1d9dcd13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_render/src/shader/shader_reflect.rs
View File

@ -412,9 +412,7 @@ mod tests {
name: "Camera".into(), name: "Camera".into(),
bind_type: BindType::Uniform { bind_type: BindType::Uniform {
dynamic: false, dynamic: false,
property: UniformProperty::Struct(vec![ property: UniformProperty::Struct(vec![UniformProperty::Mat4]),
UniformProperty::Mat4
]),
}, },
shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT, shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
}] }]

5
crates/bevy_wgpu/src/wgpu_type_converter.rs
View File

@ -180,10 +180,7 @@ where
impl WgpuFrom<&BindType> for wgpu::BindingType { impl WgpuFrom<&BindType> for wgpu::BindingType {
fn from(bind_type: &BindType) -> Self { fn from(bind_type: &BindType) -> Self {
match bind_type { match bind_type {
BindType::Uniform { BindType::Uniform { dynamic, .. } => wgpu::BindingType::UniformBuffer {
dynamic,
..
} => wgpu::BindingType::UniformBuffer {
dynamic: *dynamic, dynamic: *dynamic,
min_binding_size: bind_type min_binding_size: bind_type
.get_uniform_size() .get_uniform_size()