From a9f218a966a3a5fd55e045ad8bf4a0276bfcac89 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Thu, 6 Feb 2025 10:01:50 +0800 Subject: [PATCH] radeonsi: fix has_non_uniform_tex_access info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: f859436b557 ("radeonsi: add has_non_uniform_tex_access shader info") Tested-by: Mike Lothian Reviewed-by: Marek Olšák Part-of: (cherry picked from commit c805ea6792a004e77f9b9897aff10b0bb876e676) --- .pick_status.json | 2 +- src/gallium/drivers/radeonsi/si_shader_info.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 327d810b6c0..76f925e4f72 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -24,7 +24,7 @@ "description": "radeonsi: fix has_non_uniform_tex_access info", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f859436b55711684602336f8d9a8dc498ad5fe16", "notes": null diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c index b539f1fa3eb..78b0c50cc96 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_info.c @@ -308,7 +308,7 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info info->uses_indirect_descriptor = true; } - info->has_non_uniform_tex_access = + info->has_non_uniform_tex_access |= tex->texture_non_uniform || tex->sampler_non_uniform; info->has_shadow_comparison |= tex->is_shadow;