From ec0bab8ca9eaed4648cf9e90398606fa4fc6e747 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 11 Dec 2020 13:11:26 -0800 Subject: [PATCH] gallium/ntt: Fix emitting UBO declarations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: d70fff99c5bc ("nir: Use a single list for all shader variables") Reviewed-by: Marek Olšák Part-of: --- src/gallium/auxiliary/nir/nir_to_tgsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index 51968bd7447..b3269be3644 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -259,8 +259,6 @@ ntt_setup_uniforms(struct ntt_compile *c) var->data.image.format, !var->data.read_only, false); - } else if (var->data.mode == nir_var_mem_ubo) { - ureg_DECL_constant2D(c->ureg, 0, 0, var->data.driver_location + 1); } else { unsigned size; if (packed) { @@ -275,6 +273,10 @@ ntt_setup_uniforms(struct ntt_compile *c) } } + nir_foreach_variable_with_modes(var, c->s, nir_var_mem_ubo) { + ureg_DECL_constant2D(c->ureg, 0, 0, var->data.driver_location + 1); + } + for (int i = 0; i < PIPE_MAX_SAMPLERS; i++) { if (c->s->info.textures_used & (1 << i)) ureg_DECL_sampler(c->ureg, i);