mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-03-15 07:29:17 +01:00
[dxvk] Fix framebuffer resolve barriers
This commit is contained in:
parent
79feed9d89
commit
5d7b5b0e35
@ -3219,27 +3219,6 @@ namespace dxvk {
|
|||||||
m_cmd->cmdBeginRenderPass(&info, VK_SUBPASS_CONTENTS_INLINE);
|
m_cmd->cmdBeginRenderPass(&info, VK_SUBPASS_CONTENTS_INLINE);
|
||||||
m_cmd->cmdEndRenderPass();
|
m_cmd->cmdEndRenderPass();
|
||||||
|
|
||||||
m_execBarriers.accessImage(
|
|
||||||
dstImage, dstSubresourceRange,
|
|
||||||
dstImage->info().layout,
|
|
||||||
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
|
|
||||||
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
|
|
||||||
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
|
|
||||||
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
|
|
||||||
dstImage->info().layout,
|
|
||||||
dstImage->info().stages,
|
|
||||||
dstImage->info().access);
|
|
||||||
|
|
||||||
m_execBarriers.accessImage(
|
|
||||||
srcImage, srcSubresourceRange,
|
|
||||||
srcImage->info().layout,
|
|
||||||
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
|
|
||||||
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
|
|
||||||
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT,
|
|
||||||
srcImage->info().layout,
|
|
||||||
srcImage->info().stages,
|
|
||||||
srcImage->info().access);
|
|
||||||
|
|
||||||
m_cmd->trackResource<DxvkAccess::Write>(dstImage);
|
m_cmd->trackResource<DxvkAccess::Write>(dstImage);
|
||||||
m_cmd->trackResource<DxvkAccess::Read>(srcImage);
|
m_cmd->trackResource<DxvkAccess::Read>(srcImage);
|
||||||
m_cmd->trackResource<DxvkAccess::None>(fb);
|
m_cmd->trackResource<DxvkAccess::None>(fb);
|
||||||
@ -3381,21 +3360,14 @@ namespace dxvk {
|
|||||||
m_cmd->cmdDraw(3, region.dstSubresource.layerCount, 0, 0);
|
m_cmd->cmdDraw(3, region.dstSubresource.layerCount, 0, 0);
|
||||||
m_cmd->cmdEndRenderPass();
|
m_cmd->cmdEndRenderPass();
|
||||||
|
|
||||||
m_execBarriers.accessImage(
|
if (srcImage->info().layout != srcLayout) {
|
||||||
dstImage, dstSubresourceRange,
|
|
||||||
dstImage->info().layout,
|
|
||||||
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
|
|
||||||
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
|
|
||||||
dstImage->info().layout,
|
|
||||||
dstImage->info().stages,
|
|
||||||
dstImage->info().access);
|
|
||||||
|
|
||||||
m_execBarriers.accessImage(
|
m_execBarriers.accessImage(
|
||||||
srcImage, srcSubresourceRange, srcLayout,
|
srcImage, srcSubresourceRange, srcLayout,
|
||||||
VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0,
|
VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0,
|
||||||
srcImage->info().layout,
|
srcImage->info().layout,
|
||||||
srcImage->info().stages,
|
srcImage->info().stages,
|
||||||
srcImage->info().access);
|
srcImage->info().access);
|
||||||
|
}
|
||||||
|
|
||||||
m_cmd->trackResource<DxvkAccess::Write>(dstImage);
|
m_cmd->trackResource<DxvkAccess::Write>(dstImage);
|
||||||
m_cmd->trackResource<DxvkAccess::Read>(srcImage);
|
m_cmd->trackResource<DxvkAccess::Read>(srcImage);
|
||||||
|
@ -88,6 +88,33 @@ namespace dxvk {
|
|||||||
subpass.preserveAttachmentCount = 0;
|
subpass.preserveAttachmentCount = 0;
|
||||||
subpass.pPreserveAttachments = nullptr;
|
subpass.pPreserveAttachments = nullptr;
|
||||||
|
|
||||||
|
VkPipelineStageFlags cpyStages = 0;
|
||||||
|
VkAccessFlags cpyAccess = 0;
|
||||||
|
|
||||||
|
if (isColorImage) {
|
||||||
|
cpyStages |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
|
||||||
|
cpyAccess |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
|
||||||
|
|
||||||
|
if (!discard)
|
||||||
|
cpyAccess |= VK_ACCESS_COLOR_ATTACHMENT_READ_BIT;
|
||||||
|
} else {
|
||||||
|
cpyStages |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
|
||||||
|
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
|
||||||
|
cpyAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
|
||||||
|
|
||||||
|
if (!discard)
|
||||||
|
cpyAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve targets are required to be render targets
|
||||||
|
VkPipelineStageFlags extStages = m_dstImageView->imageInfo().stages | m_srcImageView->imageInfo().stages;
|
||||||
|
VkAccessFlags extAccess = m_dstImageView->imageInfo().access;
|
||||||
|
|
||||||
|
std::array<VkSubpassDependency, 2> dependencies = {{
|
||||||
|
{ VK_SUBPASS_EXTERNAL, 0, cpyStages, cpyStages, 0, cpyAccess, 0 },
|
||||||
|
{ 0, VK_SUBPASS_EXTERNAL, cpyStages, extStages, cpyAccess, extAccess, 0 },
|
||||||
|
}};
|
||||||
|
|
||||||
VkRenderPassCreateInfo info;
|
VkRenderPassCreateInfo info;
|
||||||
info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
||||||
info.pNext = nullptr;
|
info.pNext = nullptr;
|
||||||
@ -96,8 +123,8 @@ namespace dxvk {
|
|||||||
info.pAttachments = &attachment;
|
info.pAttachments = &attachment;
|
||||||
info.subpassCount = 1;
|
info.subpassCount = 1;
|
||||||
info.pSubpasses = &subpass;
|
info.pSubpasses = &subpass;
|
||||||
info.dependencyCount = 0;
|
info.dependencyCount = dependencies.size();
|
||||||
info.pDependencies = nullptr;
|
info.pDependencies = dependencies.data();
|
||||||
|
|
||||||
VkRenderPass result = VK_NULL_HANDLE;
|
VkRenderPass result = VK_NULL_HANDLE;
|
||||||
if (m_vkd->vkCreateRenderPass(m_vkd->device(), &info, nullptr, &result) != VK_SUCCESS)
|
if (m_vkd->vkCreateRenderPass(m_vkd->device(), &info, nullptr, &result) != VK_SUCCESS)
|
||||||
@ -176,6 +203,16 @@ namespace dxvk {
|
|||||||
subpass.preserveAttachmentCount = 0;
|
subpass.preserveAttachmentCount = 0;
|
||||||
subpass.pPreserveAttachments = nullptr;
|
subpass.pPreserveAttachments = nullptr;
|
||||||
|
|
||||||
|
VkPipelineStageFlags cpyStages = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
|
||||||
|
VkPipelineStageFlags extStages = m_dstImageView->imageInfo().stages | m_srcImageView->imageInfo().stages;
|
||||||
|
VkAccessFlags cpyAccess = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
|
||||||
|
VkAccessFlags extAccess = m_dstImageView->imageInfo().access;
|
||||||
|
|
||||||
|
std::array<VkSubpassDependency2KHR, 2> dependencies = {{
|
||||||
|
{ VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR, nullptr, VK_SUBPASS_EXTERNAL, 0, cpyStages, cpyStages, 0, cpyAccess, 0 },
|
||||||
|
{ VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR, nullptr, 0, VK_SUBPASS_EXTERNAL, cpyStages, extStages, cpyAccess, extAccess, 0 },
|
||||||
|
}};
|
||||||
|
|
||||||
VkRenderPassCreateInfo2KHR info;
|
VkRenderPassCreateInfo2KHR info;
|
||||||
info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR;
|
info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR;
|
||||||
info.pNext = nullptr;
|
info.pNext = nullptr;
|
||||||
@ -184,8 +221,8 @@ namespace dxvk {
|
|||||||
info.pAttachments = attachments.data();
|
info.pAttachments = attachments.data();
|
||||||
info.subpassCount = 1;
|
info.subpassCount = 1;
|
||||||
info.pSubpasses = &subpass;
|
info.pSubpasses = &subpass;
|
||||||
info.dependencyCount = 0;
|
info.dependencyCount = dependencies.size();
|
||||||
info.pDependencies = nullptr;
|
info.pDependencies = dependencies.data();
|
||||||
info.correlatedViewMaskCount = 0;
|
info.correlatedViewMaskCount = 0;
|
||||||
info.pCorrelatedViewMasks = nullptr;
|
info.pCorrelatedViewMasks = nullptr;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user