From b79620d064d54901e8bbd4f4034ae1bf8a71e3c0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 23 Jul 2025 10:37:29 -0400 Subject: [PATCH] anv: fix format compatibility check typo the view format is above this Fixes: 03cdb3078a ("anv: Support multi-planar formats in anv_formats_are_compatible") Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 8a4ef5977e20d42f645896a5bbf0c5b2b78d72f2) --- .pick_status.json | 2 +- src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt | 3 --- src/intel/vulkan/anv_formats.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0a3b8f8d4c6..0cf790d2eb8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2644,7 +2644,7 @@ "description": "anv: fix format compatibility check typo", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "03cdb3078a344146695a223f23a40cf1dac4e9af", "notes": null diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index 4a68a114a1b..0b84e89665c 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -694,6 +694,3 @@ glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1,Fail # New failures with GL CTS 4.6.6.0 & ES CTS 3.2.12.0 KHR-GLES31.core.texture_stencil8.multisample,Crash - -# Validation error VUID-StandaloneSpirv-None-10684 -KHR-GL46.buffer_storage.map_persistent_texture,Crash diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index f08d1ec2bc3..fe72f5be506 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -1313,7 +1313,7 @@ anv_formats_are_compatible( isl_format_get_layout(img_view_isl_fmt0); const enum isl_format img_isl_fmt0 = anv_get_format_plane(physical_device, - img_view_fmt->vk_format, 0, tiling).isl_format; + img_fmt->vk_format, 0, tiling).isl_format; const struct isl_format_layout *img_fmt0_layout = isl_format_get_layout(img_isl_fmt0);