From 2caf346fbb3c61ab1bf26785e2027ea9f84db391 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 9 Jul 2018 11:23:28 +0200 Subject: [PATCH] [dxvk] Add access flags to external subpass dependencies again Apparently we need those to make sure that the initial layout transition itself is valid. We don't need to add shader access though, since we cannot access attachments inside shaders. --- src/dxvk/dxvk_meta_mipgen.cpp | 2 +- src/dxvk/dxvk_meta_resolve.cpp | 2 +- src/dxvk/dxvk_renderpass.cpp | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/dxvk/dxvk_meta_mipgen.cpp b/src/dxvk/dxvk_meta_mipgen.cpp index 4ba46c00f..d0c68497c 100644 --- a/src/dxvk/dxvk_meta_mipgen.cpp +++ b/src/dxvk/dxvk_meta_mipgen.cpp @@ -56,7 +56,7 @@ namespace dxvk { { VK_SUBPASS_EXTERNAL, 0, m_view->imageInfo().stages, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, - 0, 0, 0 }, + 0, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, 0 }, { 0, VK_SUBPASS_EXTERNAL, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, m_view->imageInfo().stages, diff --git a/src/dxvk/dxvk_meta_resolve.cpp b/src/dxvk/dxvk_meta_resolve.cpp index 24064505d..41a5dba69 100644 --- a/src/dxvk/dxvk_meta_resolve.cpp +++ b/src/dxvk/dxvk_meta_resolve.cpp @@ -30,7 +30,7 @@ namespace dxvk { { VK_SUBPASS_EXTERNAL, 0, m_dstImageView->imageInfo().stages, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, - 0, 0, 0 }, + 0, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, 0 }, { 0, VK_SUBPASS_EXTERNAL, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, m_dstImageView->imageInfo().stages, diff --git a/src/dxvk/dxvk_renderpass.cpp b/src/dxvk/dxvk_renderpass.cpp index 4ee904f36..9bb6517c5 100644 --- a/src/dxvk/dxvk_renderpass.cpp +++ b/src/dxvk/dxvk_renderpass.cpp @@ -125,7 +125,11 @@ namespace dxvk { { VK_SUBPASS_EXTERNAL, 0, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, - 0, 0, 0 }, + 0, + VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | + VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, 0 }, { 0, VK_SUBPASS_EXTERNAL, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,