fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

d3d12: Decay state when resolving context -> global state

Browse source 
Also ensure that *all* promotions are considered promotions, not
just ones that combine with an existing state bit.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39077>
This commit is contained in:
Jesse Natalie 2025-12-23 10:22:55 -08:00 • committed by Marge Bot
parent fe48cd7c5a
commit 86587517b2
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/drivers/d3d12/d3d12_resource_state.cpp
View file

@ -180,12 +180,19 @@ static void
copy_resource_state(d3d12_resource_state *dest, d3d12_resource_state *src)
{
assert(dest->num_subresources == src->num_subresources);
if (src->homogenous)
set_resource_state(dest, &src->subresource_states[0]);
else {
if (src->homogenous) {
if (src->subresource_states[0].may_decay)
reset_resource_state(dest);
else
set_resource_state(dest, &src->subresource_states[0]);
} else {
dest->homogenous = false;
for (unsigned i = 0; i < src->num_subresources; ++i)
dest->subresource_states[i] = src->subresource_states[i];
for (unsigned i = 0; i < src->num_subresources; ++i) {
if (src->subresource_states[i].may_decay)
dest->subresource_states[i] = {};
else
dest->subresource_states[i] = src->subresource_states[i];
}
}
}
@ -352,6 +359,7 @@ context_state_resolve_submission(struct d3d12_context *ctx, d3d12_bo *bo)
copy_resource_state(&bo_state->batch_begin, &bo_state->batch_end);
copy_resource_state(&bo->global_state, &bo_state->batch_end);
copy_resource_state(&bo_state->batch_end, &bo_state->batch_begin);
} else {
reset_resource_state(&bo_state->batch_end);
}
@ -456,7 +464,7 @@ append_barrier(struct d3d12_context *ctx,
may_decay = current_state->supports_simultaneous_access && !d3d12_is_write_state(after);
is_promotion = false;
}
} else if (after != state_if_promoted) {
} else {
after = state_if_promoted;
may_decay = !d3d12_is_write_state(after);
is_promotion = true;