nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-20 10:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix coalescing of descriptor sets

Browse Source
This commit is contained in:
Dzmitry Malyshau 2020-10-11 22:02:27 -04:00
parent f963193be1
commit 56df63b122
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wgpu-core/src/device/mod.rs
View File

@ -2355,19 +2355,40 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
}
if let Some(start_binding) = write_map.keys().next().cloned() {
let descriptors = write_map
.into_iter()
.flat_map(|(_, list)| list)
.collect::<Vec<_>>();
let write = hal::pso::DescriptorSetWrite {
set: desc_set.raw(),
binding: start_binding,
array_offset: 0,
descriptors,
};
if !write_map.is_empty() {
#[derive(PartialEq)]
enum DescriptorType {
Buffer,
Sampler,
TextureView,
}
let mut writes = Vec::<hal::pso::DescriptorSetWrite<_, SmallVec<[_; 1]>>>::new();
let mut prev_stages = wgt::ShaderStage::empty();
let mut prev_ty = DescriptorType::Buffer;
for (binding, list) in write_map {
let layout = &bind_group_layout.entries[&binding];
let ty = match layout.ty {
wgt::BindingType::UniformBuffer { .. }
| wgt::BindingType::StorageBuffer { .. } => DescriptorType::Buffer,
wgt::BindingType::Sampler { .. } => DescriptorType::Sampler,
wgt::BindingType::SampledTexture { .. }
| wgt::BindingType::StorageTexture { .. } => DescriptorType::TextureView,
};
if layout.visibility == prev_stages && ty == prev_ty {
writes.last_mut().unwrap().descriptors.extend(list);
} else {
prev_stages = layout.visibility;
prev_ty = ty;
writes.push(hal::pso::DescriptorSetWrite {
set: desc_set.raw(),
binding,
array_offset: 0,
descriptors: list.into_iter().collect(),
});
}
}
unsafe {
device.raw.write_descriptor_sets(iter::once(write));
device.raw.write_descriptor_sets(writes);
}
}
desc_set