From b8a54c50a6a425e95a3ce72986a32b630729814a Mon Sep 17 00:00:00 2001 From: Illia Polishchuk Date: Mon, 11 Sep 2023 16:10:57 +0300 Subject: [PATCH] nir: fix invalid sampler search by texture id Sampler id cannot be mapped to a uniform object location Fixes: 1a8dd84ec61 ("nir: Propagate the type sampler type change to the used variable.") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9793 Reviewed-By: Mike Blumenkrantz Signed-off-by: Illia Polishchuk Part-of: --- src/compiler/nir/nir_remove_tex_shadow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_remove_tex_shadow.c b/src/compiler/nir/nir_remove_tex_shadow.c index 8646821a1e4..9e1e1ba128c 100644 --- a/src/compiler/nir/nir_remove_tex_shadow.c +++ b/src/compiler/nir/nir_remove_tex_shadow.c @@ -85,7 +85,8 @@ remove_tex_shadow(struct nir_builder *b, nir_instr *instr, void *data) sampler->type = strip_shadow_with_array(sampler->type); sampler_deref->type = sampler->type; } else { - sampler = nir_find_variable_with_location(b->shader, nir_var_uniform, tex->sampler_index); + sampler = nir_find_sampler_variable_with_tex_index(b->shader, + tex->texture_index); sampler->type = strip_shadow_with_array(sampler->type); }