From a18dbb4a5d05358f612c2249a10d6574d2072521 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 15 May 2024 23:46:43 +0200 Subject: [PATCH] nir/lower_cl_images: set binding also for samplers Fixes https://github.com/darktable-org/darktable/issues/16717 on radeonsi. Fixes: 31ed24cec7c ("nir/lower_images: extract from clover") Part-of: (cherry picked from commit 564e569072d874a61097f1a622184975855207c8) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_cl_images.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c89b576ad12..252ed7c6a00 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -514,7 +514,7 @@ "description": "nir/lower_cl_images: set binding also for samplers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "31ed24cec7c63fc3906e7629edf235e333c94ffe", "notes": null diff --git a/src/compiler/nir/nir_lower_cl_images.c b/src/compiler/nir/nir_lower_cl_images.c index c172128b650..13063593aad 100644 --- a/src/compiler/nir/nir_lower_cl_images.c +++ b/src/compiler/nir/nir_lower_cl_images.c @@ -161,6 +161,7 @@ nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_samp assert(var->data.location > last_loc); last_loc = var->data.location; var->data.driver_location = num_samplers++; + var->data.binding = var->data.driver_location; } else { /* CL shouldn't have any sampled images */ assert(!glsl_type_is_sampler(var->type));