github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix push constant pipeline invalidation

Browse Source
This commit is contained in:
Connor Fitzgerald
2020-07-24 14:41:46 -04:00
parent 0591c48fd2
commit b9498952a1
3 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wgpu-core/src/command/bind.rs
View File

@@ -3,9 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use crate::{
binding_model::BindGroup,
binding_model::{BindGroup, PipelineLayout},
device::SHADER_STAGE_COUNT,
hub::GfxBackend,
hub::{GfxBackend, Storage},
id::{BindGroupId, BindGroupLayoutId, PipelineLayoutId},
Stored, MAX_BIND_GROUPS,
};
@@ -151,7 +151,25 @@ impl Binder {
self.entries.clear();
}
pub(crate) fn reset_expectations(&mut self, length: usize) {
pub(crate) fn change_pipeline_layout<B: GfxBackend>(
&mut self,
guard: &Storage<PipelineLayout<B>, PipelineLayoutId>,
new_id: PipelineLayoutId,
) {
let old_id_opt = self.pipeline_layout_id.replace(new_id);
let new = &guard[new_id];
let length = if let Some(old_id) = old_id_opt {
let old = &guard[old_id];
if old.push_constant_ranges == new.push_constant_ranges {
new.bind_group_layout_ids.len()
} else {
0
}
} else {
0
};
for entry in self.entries[length..].iter_mut() {
entry.expected_layout_id = None;
}

10
wgpu-core/src/command/compute.rs
View File

@@ -251,10 +251,12 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
// Rebind resources
if state.binder.pipeline_layout_id != Some(pipeline.layout_id.value) {
let pipeline_layout = &pipeline_layout_guard[pipeline.layout_id.value];
state.binder.pipeline_layout_id = Some(pipeline.layout_id.value);
state
.binder
.reset_expectations(pipeline_layout.bind_group_layout_ids.len());
state.binder.change_pipeline_layout(
&*pipeline_layout_guard,
pipeline.layout_id.value,
);
let mut is_compatible = true;
for (index, (entry, &bgl_id)) in state

10
wgpu-core/src/command/render.rs
View File

@@ -1103,10 +1103,12 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
// Rebind resource
if state.binder.pipeline_layout_id != Some(pipeline.layout_id.value) {
let pipeline_layout = &pipeline_layout_guard[pipeline.layout_id.value];
state.binder.pipeline_layout_id = Some(pipeline.layout_id.value);
state
.binder
.reset_expectations(pipeline_layout.bind_group_layout_ids.len());
state.binder.change_pipeline_layout(
&*pipeline_layout_guard,
pipeline.layout_id.value,
);
let mut is_compatible = true;
for (index, (entry, &bgl_id)) in state