From 94077ed42b22d80cf7e56f3fc02b745c4638d838 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Fri, 1 May 2020 21:10:31 +0200
Subject: [PATCH] [dxvk] Reintroduce EXTERNAL->0 subpass dependency

Ensures that the layout transition happens at the right time, and
otherwise relaxes the barrier since it is assumed that the backend
will emit barriers with the appropriate as necessary.
---
 src/dxvk/dxvk_renderpass.cpp | 41 +++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/dxvk/dxvk_renderpass.cpp b/src/dxvk/dxvk_renderpass.cpp
index 60d37b8b5..be2858ed9 100644
--- a/src/dxvk/dxvk_renderpass.cpp
+++ b/src/dxvk/dxvk_renderpass.cpp
@@ -140,9 +140,48 @@ namespace dxvk {
     if (m_format.depth.format == VK_FORMAT_UNDEFINED)
       subpass.pDepthStencilAttachment = nullptr;
     
-    std::array<VkSubpassDependency, 3> subpassDeps;
+    std::array<VkSubpassDependency, 4> subpassDeps;
     uint32_t                           subpassDepCount = 0;
 
+    VkPipelineStageFlags renderStages = 0;
+    VkAccessFlags        renderAccess = 0;
+
+    if (m_format.depth.format) {
+      renderStages |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
+                   |  VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+
+      VkImageAspectFlags loadAspects = 0;
+
+      if (ops.depthOps.loadOpD == VK_ATTACHMENT_LOAD_OP_LOAD)
+        loadAspects = VK_IMAGE_ASPECT_DEPTH_BIT;
+      if (ops.depthOps.loadOpS == VK_ATTACHMENT_LOAD_OP_LOAD)
+        loadAspects = VK_IMAGE_ASPECT_STENCIL_BIT;
+
+      if (loadAspects & imageFormatInfo(m_format.depth.format)->aspectMask)
+        renderAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
+      
+      if (m_format.depth.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL)
+        renderAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+    }
+
+    for (uint32_t i = 0; i < MaxNumRenderTargets; i++) {
+      if (!m_format.color[i].format)
+        continue;
+
+      renderStages |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+      renderAccess |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+
+      if (ops.colorOps[i].loadOp == VK_ATTACHMENT_LOAD_OP_LOAD)
+        renderAccess |= VK_ACCESS_COLOR_ATTACHMENT_READ_BIT;
+    }
+
+    if (renderStages) {
+      subpassDeps[subpassDepCount++] = {
+        VK_SUBPASS_EXTERNAL, 0,
+        renderStages, renderStages,
+        0, renderAccess };
+    }
+
     if (ops.barrier.srcStages & (
           VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT |
           VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT |