mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/client: Run D3D12 swapchain initial barriers after all possible points of failure.

Browse source
This commit is contained in:
Fernando Velazquez Innella 2024-03-06 11:04:29 -05:00
parent 4b3f7bba95
commit 13ea0ab546
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/xrt/compositor/client/comp_d3d12_client.cpp
View file

@ -525,33 +525,6 @@ try {
/// @todo No idea if this is right, might depend on whether it's the compute or graphics compositor! /// @todo No idea if this is right, might depend on whether it's the compute or graphics compositor!
D3D12_RESOURCE_STATES compositorResourceState = D3D12_RESOURCE_STATE_COMMON; D3D12_RESOURCE_STATES compositorResourceState = D3D12_RESOURCE_STATE_COMMON;
// app_images do not inherit the initial state of images, so
// transition all app images from _COMMON to the correct state
{
D3D12_RESOURCE_BARRIER barrier{};
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COMMON;
barrier.Transition.StateAfter = appResourceState;
barrier.Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
data->state.resize(image_count, barrier.Transition.StateAfter);
std::vector<D3D12_RESOURCE_BARRIER> barriers;
for (const auto &image : data->app_images) {
barrier.Transition.pResource = image.get();
barriers.emplace_back(barrier);
}
wil::com_ptr<ID3D12GraphicsCommandList> commandList;
THROW_IF_FAILED(c->device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT,
c->command_allocator.get(), nullptr,
IID_PPV_ARGS(commandList.put())));
commandList->ResourceBarrier((UINT)barriers.size(), barriers.data());
commandList->Close();
std::array<ID3D12CommandList *, 1> commandLists{commandList.get()};
c->app_queue->ExecuteCommandLists((UINT)commandLists.size(), commandLists.data());
}
data->appResourceState = appResourceState; data->appResourceState = appResourceState;
data->compositorResourceState = compositorResourceState; data->compositorResourceState = compositorResourceState;
@ -662,6 +635,33 @@ try {
return xret; return xret;
} }
// app_images do not inherit the initial state of images, so
// transition all app images from _COMMON to the correct state
{
D3D12_RESOURCE_BARRIER barrier{};
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COMMON;
barrier.Transition.StateAfter = appResourceState;
barrier.Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
data->state.resize(image_count, barrier.Transition.StateAfter);
std::vector<D3D12_RESOURCE_BARRIER> barriers;
for (const auto &image : data->app_images) {
barrier.Transition.pResource = image.get();
barriers.emplace_back(barrier);
}
wil::com_ptr<ID3D12GraphicsCommandList> commandList;
THROW_IF_FAILED(c->device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT,
c->command_allocator.get(), nullptr,
IID_PPV_ARGS(commandList.put())));
commandList->ResourceBarrier((UINT)barriers.size(), barriers.data());
commandList->Close();
std::array<ID3D12CommandList *, 1> commandLists{commandList.get()};
c->app_queue->ExecuteCommandLists((UINT)commandLists.size(), commandLists.data());
}
auto release_image_fn = compositorNeedsCopy // auto release_image_fn = compositorNeedsCopy //
? client_d3d12_swapchain_release_image_copy ? client_d3d12_swapchain_release_image_copy
: client_d3d12_swapchain_release_image; : client_d3d12_swapchain_release_image;