From 57945596479e7483e2d6e952f54c6fb0e7580d25 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 6 May 2026 21:41:22 +0200 Subject: [PATCH] nir/lower_cl_images: call nir_progress on every function llvmpipe supports real function calls, so we need to call nir_progress on every function, not just the entry point. Cc: mesa-stable Reviewed-by: Dave Airlie Acked-by: Adam Jackson (cherry picked from commit 3df48dec239db3d3af2836749b312554fda78411) Part-of: --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_cl_images.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f08bd93927b..4da5d99ac64 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2764,7 +2764,7 @@ "description": "nir/lower_cl_images: call nir_progress on every function", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/nir/nir_lower_cl_images.c b/src/compiler/nir/nir_lower_cl_images.c index 0bc007149b8..49bc193a057 100644 --- a/src/compiler/nir/nir_lower_cl_images.c +++ b/src/compiler/nir/nir_lower_cl_images.c @@ -109,6 +109,12 @@ nir_dedup_inline_samplers(nir_shader *nir) bool nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_sampler_derefs) { + nir_foreach_function_with_impl(function, impl, shader) { + if (function->is_entrypoint) + continue; + nir_no_progress(impl); + } + nir_function_impl *impl = nir_shader_get_entrypoint(shader); ASSERTED int last_loc = -1;