fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 17:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

d3d12: Fix resolving global state vs per-context state with promotion

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39077>
This commit is contained in:
Jesse Natalie 2025-12-23 14:40:47 -08:00 • committed by Marge Bot
parent 43ed15a61b
commit d9d33b7c96
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -335,15 +335,24 @@ resolve_global_state(struct d3d12_context *ctx, struct d3d12_bo *bo, d3d12_resou
D3D12_RESOURCE_STATES promotable_state =
resource_state_if_promoted(target_state->state, false, current_state);
D3D12_RESOURCE_STATES after = target_state->state;
if ((promotable_state & target_state->state) == target_state->state ||
!transition_required(current_state->state, &after))
if (promotable_state != D3D12_RESOURCE_STATE_COMMON) {
// If we're allowed to promote, then we must be in common, since we're not currently in a
// command list - in other words, previous executions would've decayed. We assert this
// because otherwise, the first barrier in the already-recorded command list would be
// wrong, missing whatever state bits we're promoting from here.
assert(current_state->state == D3D12_RESOURCE_STATE_COMMON);
continue;
}
if (current_state->state == target_state->state)
continue;
D3D12_RESOURCE_BARRIER barrier = { D3D12_RESOURCE_BARRIER_TYPE_TRANSITION };
barrier.Transition.pResource = bo->res;
barrier.Transition.StateBefore = current_state->state;
barrier.Transition.StateAfter = after;
// Note: We throw away any modifications to 'after' because we need our final state to be an exact match
// for barriers in the already-recorded command list
barrier.Transition.StateAfter = target_state->state;
barrier.Transition.Subresource = num_subresources == 1 ? D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES : i;
assert(!bo->is_front_buffer); // No explicit barriers against front buffers
util_dynarray_append(&ctx->barrier_scratch, barrier);