From: Samuel Pitoiset Date: Thu, 2 May 2019 16:07:11 +0000 (+0200) Subject: radv: fix radv_get_aspect_format() for D+S formats X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e68d7bec677f61645dc41226df5cfa9b56b01b56;p=mesa.git radv: fix radv_get_aspect_format() for D+S formats This restores the previous behaviour before YCBCR landed. For D+S formats, it returns the depth format. This fixes an assertion with Thrones of Britannia. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110540 Fixes: 66507cc6563 ("radv: Add single plane image views & meta operations") Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index a487a5576a6..92409d147f1 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1189,6 +1189,8 @@ radv_get_aspect_format(struct radv_image *image, VkImageAspectFlags mask) return vk_format_stencil_only(image->vk_format); case VK_IMAGE_ASPECT_DEPTH_BIT: return vk_format_depth_only(image->vk_format); + case VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT: + return vk_format_depth_only(image->vk_format); default: return image->vk_format; }