Module: Mesa Branch: staging/23.3 Commit: f776553f4d77835860cc3c2961fe6233e71f460c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f776553f4d77835860cc3c2961fe6233e71f460c
Author: Samuel Pitoiset <[email protected]> Date: Mon Dec 4 13:57:21 2023 +0100 radv: set combinedImageSamplerDescriptorCount to 1 for multi-planar formats RADV compacts all descriptors for multi-planar images into one combined image sampler, so it should be 96, and not eg. 192 for a two planes format. Fixes new CTS dEQP-VK.binding_model.descriptor_buffer.ycbcr_sampler.*array. Cc: mesa-stable Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26498> (cherry picked from commit 3678482f1e834cd12b17fd0bbd18d7ba2de34a9f) --- .pick_status.json | 2 +- src/amd/vulkan/radv_formats.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bd033e943ac..b7384d58c7e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3044,7 +3044,7 @@ "description": "radv: set combinedImageSamplerDescriptorCount to 1 for multi-planar formats", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 3230862878a..9195dc90880 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -1695,7 +1695,7 @@ radv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, } if (ycbcr_props) { - ycbcr_props->combinedImageSamplerDescriptorCount = vk_format_get_plane_count(format); + ycbcr_props->combinedImageSamplerDescriptorCount = 1; } if (texture_lod_props) {
