From 42b6bd48b7985d12e5729bcb510580d48a4ccd40 Mon Sep 17 00:00:00 2001 From: Rebecca Mckeever Date: Thu, 20 Mar 2025 14:36:35 -0700 Subject: [PATCH] panvk: Remove lower_tg4_broadcom_swizzle from panvk_preprocess_nir() We are already applying the .bagr swizzle in bifrost_preprocess_nir(), so remove lower_tg4_broadcom_swizzle from nir_lower_tex_options in panvk_preprocess_nir to avoid applying the swizzle twice. Fixes: 4050697a8f4 ("panvk: So more nir_lower_tex before descriptor lowering") Signed-off-by: Rebecca Mckeever Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit f450807b68e1415d1154b4fe0be2af31b6c1fb11) --- .pick_status.json | 2 +- src/panfrost/vulkan/panvk_vX_shader.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 834de5e6a24..66ba97d3ecc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -374,7 +374,7 @@ "description": "panvk: Remove lower_tg4_broadcom_swizzle from panvk_preprocess_nir()", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "4050697a8f4620109388c02cd8e7437f21e12dc4", "notes": null diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index ce223a145f6..116c7175374 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -346,7 +346,6 @@ panvk_preprocess_nir(UNUSED struct vk_physical_device *vk_pdev, nir_shader *nir) nir_lower_tex_options lower_tex_options = { .lower_txs_lod = true, .lower_txp = ~0, - .lower_tg4_broadcom_swizzle = true, .lower_txd_cube_map = true, .lower_invalid_implicit_lod = true, };