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

Fixed formatting.

Browse Source
This commit is contained in:
John Mitchell 2020-08-19 10:00:45 -04:00
parent 131a5e9167
commit f1b0d04e53
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_render/src/pipeline/pipeline_layout.rs
View File

@ -47,7 +47,7 @@ impl PipelineLayout {
} }
} }
} }
for vertex_buffer_descriptor in shader_layouts[0].vertex_buffer_descriptors.iter() { for vertex_buffer_descriptor in shader_layouts[0].vertex_buffer_descriptors.iter() {
vertex_buffer_descriptors.push(vertex_buffer_descriptor.clone()); vertex_buffer_descriptors.push(vertex_buffer_descriptor.clone());
} }

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

@ -9,7 +9,8 @@ use bevy_core::AsBytes;
use spirv_reflect::{ use spirv_reflect::{
types::{ types::{
ReflectDescriptorBinding, ReflectDescriptorSet, ReflectDescriptorType, ReflectDimension, ReflectDescriptorBinding, ReflectDescriptorSet, ReflectDescriptorType, ReflectDimension,
ReflectInterfaceVariable, ReflectTypeDescription, ReflectTypeFlags, ReflectShaderStageFlags ReflectInterfaceVariable, ReflectShaderStageFlags, ReflectTypeDescription,
ReflectTypeFlags,
}, },
ShaderModule, ShaderModule,
}; };
@ -151,7 +152,10 @@ fn reflect_vertex_attribute_descriptor(
} }
} }
fn reflect_bind_group(descriptor_set: &ReflectDescriptorSet, shader_stage: ReflectShaderStageFlags) -> BindGroupDescriptor { fn reflect_bind_group(
descriptor_set: &ReflectDescriptorSet,
shader_stage: ReflectShaderStageFlags,
) -> BindGroupDescriptor {
let mut bindings = Vec::new(); let mut bindings = Vec::new();
for descriptor_binding in descriptor_set.bindings.iter() { for descriptor_binding in descriptor_set.bindings.iter() {
let binding = reflect_binding(descriptor_binding, shader_stage); let binding = reflect_binding(descriptor_binding, shader_stage);
@ -171,7 +175,10 @@ fn reflect_dimension(type_description: &ReflectTypeDescription) -> TextureViewDi
} }
} }
fn reflect_binding(binding: &ReflectDescriptorBinding, shader_stage: ReflectShaderStageFlags) -> BindingDescriptor { fn reflect_binding(
binding: &ReflectDescriptorBinding,
shader_stage: ReflectShaderStageFlags,
) -> BindingDescriptor {
let type_description = binding.type_description.as_ref().unwrap(); let type_description = binding.type_description.as_ref().unwrap();
let (name, bind_type) = match binding.descriptor_type { let (name, bind_type) = match binding.descriptor_type {
ReflectDescriptorType::UniformBuffer => ( ReflectDescriptorType::UniformBuffer => (
@ -205,7 +212,7 @@ fn reflect_binding(binding: &ReflectDescriptorBinding, shader_stage: ReflectShad
ReflectShaderStageFlags::COMPUTE => BindingShaderStage::COMPUTE, ReflectShaderStageFlags::COMPUTE => BindingShaderStage::COMPUTE,
ReflectShaderStageFlags::VERTEX => BindingShaderStage::VERTEX, ReflectShaderStageFlags::VERTEX => BindingShaderStage::VERTEX,
ReflectShaderStageFlags::FRAGMENT => BindingShaderStage::FRAGMENT, ReflectShaderStageFlags::FRAGMENT => BindingShaderStage::FRAGMENT,
_ => panic!("Only one specified shader stage is supported.") _ => panic!("Only one specified shader stage is supported."),
}; };
let name = name.to_string(); let name = name.to_string();