From 87d32a234d4638778777f3cbfa7ee5f67e178a83 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 24 Jun 2021 17:13:53 +0200
Subject: [PATCH] [dxvk] Handle discard aspects correctly when performing
 clears

Should fix an Nvidia driver crash, see #2118.
---
 src/dxvk/dxvk_context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index c1fc8ab5..1fe2d216 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -1817,7 +1817,7 @@ namespace dxvk {
       VkPipelineStageFlags clearStages = 0;
       VkAccessFlags        clearAccess = 0;
       
-      if (clearAspects & VK_IMAGE_ASPECT_COLOR_BIT) {
+      if ((clearAspects | discardAspects) & VK_IMAGE_ASPECT_COLOR_BIT) {
         clearStages |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
         clearAccess |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;