From 8dbec20a56eb28c2f1555ed541733220207e83c5 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Fri, 27 Dec 2024 11:25:29 +0800 Subject: [PATCH] radeonsi: fix global access ACO compile fail when OpenCL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sel->stage is MESA_SHADER_COMPUTE for OpenCL shaders, while nir->info.stage is MESA_SHADER_KERNEL. Fixes: 955ae53efda radeonsi: fix OpenCL piglit tests fails when using ACO Tested-by: Dieter Nützel Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index b6e25d43513..3d0a1fda696 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2620,7 +2620,7 @@ static struct nir_shader *si_get_nir_shader(struct si_shader *shader, struct si_ NIR_PASS(progress, nir, ac_nir_lower_mem_access_bit_sizes, sel->screen->info.gfx_level, !nir->info.use_aco_amd); - if (sel->stage == MESA_SHADER_KERNEL) { + if (nir->info.stage == MESA_SHADER_KERNEL) { NIR_PASS(progress, nir, ac_nir_lower_global_access); if (nir->info.bit_sizes_int & (8 | 16)) {