Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2025-02-16 22:18:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace vector of UniformProperty with a single property

Browse source
This commit is contained in:
Lachlan Sneff 2020-08-16 01:16:00 -04:00
parent 7db4821287
commit 9883cd15cd
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/bevy_render/src/pipeline/binding.rs
View file

@ -21,7 +21,7 @@ pub struct BindingDescriptor {
pub enum BindType {
Uniform {
dynamic: bool,
properties: Vec<UniformProperty>,
property: UniformProperty,
},
StorageBuffer {
dynamic: bool,
@ -45,11 +45,7 @@ pub enum BindType {
impl BindType {
pub fn get_uniform_size(&self) -> Option<u64> {
match self {
BindType::Uniform { properties, .. } => Some(
properties
.iter()
.fold(0, |total, property| total + property.get_size()),
),
BindType::Uniform { property, .. } => Some(property.get_size()),
_ => None,
}
}

2
crates/bevy_render/src/render_graph/nodes/pass_node.rs
View file

@ -77,7 +77,7 @@ impl<Q: HecsQuery> PassNode<Q> {
index: 0,
bind_type: BindType::Uniform {
dynamic: false,
properties: vec![UniformProperty::Struct(vec![UniformProperty::Mat4])],
property: UniformProperty::Struct(vec![UniformProperty::Mat4]),
},
shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
}],

4
crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs
View file

@ -273,7 +273,7 @@ mod tests {
name: "a".to_string(),
bind_type: BindType::Uniform {
dynamic: false,
properties: vec![UniformProperty::Struct(vec![UniformProperty::Mat4])],
property: UniformProperty::Struct(vec![UniformProperty::Mat4]),
},
shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
},
@ -282,7 +282,7 @@ mod tests {
name: "b".to_string(),
bind_type: BindType::Uniform {
dynamic: false,
properties: vec![UniformProperty::Float],
property: UniformProperty::Float,
},
shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
},

6
crates/bevy_render/src/shader/shader_reflect.rs
View file

@ -177,7 +177,7 @@ fn reflect_binding(binding: &ReflectDescriptorBinding) -> BindingDescriptor {
&type_description.type_name,
BindType::Uniform {
dynamic: false,
properties: vec![reflect_uniform(type_description)],
property: reflect_uniform(type_description),
},
),
ReflectDescriptorType::SampledImage => (
@ -412,9 +412,9 @@ mod tests {
name: "Camera".into(),
bind_type: BindType::Uniform {
dynamic: false,
properties: vec![UniformProperty::Struct(vec![
property: UniformProperty::Struct(vec![
UniformProperty::Mat4
])],
]),
},
shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
}]

2
crates/bevy_wgpu/src/wgpu_type_converter.rs
View file

@ -182,7 +182,7 @@ impl WgpuFrom<&BindType> for wgpu::BindingType {
match bind_type {
BindType::Uniform {
dynamic,
properties: _properties,
..
} => wgpu::BindingType::UniformBuffer {
dynamic: *dynamic,
min_binding_size: bind_type