From f684ae95d18e9e0f448f1ee8201a3fa349774c7c Mon Sep 17 00:00:00 2001
From: Christoph Haag <christoph.haag@collabora.com>
Date: Wed, 13 Jan 2021 20:37:09 +0100
Subject: [PATCH] comp: Fix depth-stencil image validation warning

Depth-only formats must use *only* VK_IMAGE_ASPECT_DEPTH_BIT.
Depth-stencil formats must use both VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT.
---
 src/xrt/compositor/main/comp_swapchain.c | 39 ++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/xrt/compositor/main/comp_swapchain.c b/src/xrt/compositor/main/comp_swapchain.c
index a51cef63c..f1042ff34 100644
--- a/src/xrt/compositor/main/comp_swapchain.c
+++ b/src/xrt/compositor/main/comp_swapchain.c
@@ -109,6 +109,27 @@ alloc_and_set_funcs(struct comp_compositor *c, uint32_t num_images)
 	return sc;
 }
 
+static bool
+is_depth_only_format(VkFormat format)
+{
+	return format == VK_FORMAT_D16_UNORM || format == VK_FORMAT_D32_SFLOAT;
+}
+
+static bool
+is_depth_stencil_format(VkFormat format)
+{
+
+	return format == VK_FORMAT_D16_UNORM_S8_UINT ||
+	       format == VK_FORMAT_D24_UNORM_S8_UINT ||
+	       format == VK_FORMAT_D32_SFLOAT_S8_UINT;
+}
+
+static bool
+is_stencil_only_format(VkFormat format)
+{
+	return format == VK_FORMAT_S8_UINT;
+}
+
 static void
 do_post_create_vulkan_setup(struct comp_compositor *c,
                             const struct xrt_swapchain_create_info *info,
@@ -125,8 +146,22 @@ do_post_create_vulkan_setup(struct comp_compositor *c,
 	};
 
 	bool depth = (info->bits & XRT_SWAPCHAIN_USAGE_DEPTH_STENCIL) != 0;
-	VkImageAspectFlagBits aspect =
-	    depth ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT;
+
+	VkImageAspectFlagBits aspect = 0;
+	if (depth) {
+		if (is_depth_only_format(info->format)) {
+			aspect |= VK_IMAGE_ASPECT_DEPTH_BIT;
+		}
+		if (is_depth_stencil_format(info->format)) {
+			aspect |= VK_IMAGE_ASPECT_DEPTH_BIT |
+			          VK_IMAGE_ASPECT_STENCIL_BIT;
+		}
+		if (is_stencil_only_format(info->format)) {
+			aspect |= VK_IMAGE_ASPECT_STENCIL_BIT;
+		}
+	} else {
+		aspect |= VK_IMAGE_ASPECT_COLOR_BIT;
+	}
 
 	VkFormat format = info->format;
 #if defined(XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER)