From 077aebc9e19540c954dd3555ac8e2e25401150ad Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 20 Aug 2020 10:49:23 +0100
Subject: [PATCH] Fix sanitisation of aspect mask in subresource range

---
 renderdoc/driver/vulkan/vk_resources.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h
index 963783ac4..476f3febd 100644
--- a/renderdoc/driver/vulkan/vk_resources.h
+++ b/renderdoc/driver/vulkan/vk_resources.h
@@ -1303,7 +1303,9 @@ struct ImageSubresourceRange
         RDCERR("Invalid aspect mask (%s) in image with aspects (%s)", ToStr(aspectMask).c_str(),
                ToStr(info.Aspects()).c_str());
       }
-      aspectMask &= ~info.Aspects();
+      aspectMask &= info.Aspects();
+      if(aspectMask == 0)
+        aspectMask = info.Aspects();
     }
     SanitiseLevelRange(baseMipLevel, levelCount, info.levelCount);
     SanitiseLayerRange(baseArrayLayer, layerCount, info.layerCount);