1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-04 07:24:15 +01:00

[dxvk] Use new layout transition helper in initImage

Removes another barrier set.
This commit is contained in:
Philip Rebohle 2024-10-10 17:30:57 +02:00 committed by Philip Rebohle
parent 1e8631189c
commit ef79f8a617
2 changed files with 3 additions and 10 deletions

View File

@ -12,7 +12,6 @@ namespace dxvk {
m_type (type), m_type (type),
m_common (&device->m_objects), m_common (&device->m_objects),
m_sdmaBarriers(DxvkCmdBuffer::SdmaBuffer), m_sdmaBarriers(DxvkCmdBuffer::SdmaBuffer),
m_initAcquires(DxvkCmdBuffer::InitBuffer),
m_initBarriers(DxvkCmdBuffer::InitBuffer), m_initBarriers(DxvkCmdBuffer::InitBuffer),
m_execAcquires(DxvkCmdBuffer::ExecBuffer), m_execAcquires(DxvkCmdBuffer::ExecBuffer),
m_execBarriers(DxvkCmdBuffer::ExecBuffer), m_execBarriers(DxvkCmdBuffer::ExecBuffer),
@ -1059,14 +1058,9 @@ namespace dxvk {
} else { } else {
VkImageLayout clearLayout = image->pickLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); VkImageLayout clearLayout = image->pickLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
m_initAcquires.accessImage(image, subresources, addImageInitTransition(*image, subresources, clearLayout,
initialLayout, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT);
VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0, flushImageLayoutTransitions(DxvkCmdBuffer::InitBuffer);
clearLayout,
VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_ACCESS_TRANSFER_WRITE_BIT);
m_initAcquires.recordCommands(m_cmd);
auto formatInfo = image->formatInfo(); auto formatInfo = image->formatInfo();

View File

@ -1407,7 +1407,6 @@ namespace dxvk {
Rc<DxvkDescriptorManager> m_descriptorManager; Rc<DxvkDescriptorManager> m_descriptorManager;
DxvkBarrierSet m_sdmaBarriers; DxvkBarrierSet m_sdmaBarriers;
DxvkBarrierSet m_initAcquires;
DxvkBarrierSet m_initBarriers; DxvkBarrierSet m_initBarriers;
DxvkBarrierSet m_execAcquires; DxvkBarrierSet m_execAcquires;
DxvkBarrierSet m_execBarriers; DxvkBarrierSet m_execBarriers;