From 0253ff6d55be09eb36a54654d242e7f37d3ebf7c Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Fri, 16 Jul 2021 16:13:58 -0700 Subject: [PATCH] nir_to_tgsi: Declare buffers for all of num_ssbos. Now all SSBO tests pass on virgl when taking the nir-to-tgsi path. Reviewed-by: Adam Jackson Part-of: --- src/gallium/auxiliary/nir/nir_to_tgsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index 4a000d12064..37f4384426f 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -445,12 +445,12 @@ ntt_setup_uniforms(struct ntt_compile *c) ureg_DECL_constant2D(c->ureg, 0, 0, var->data.driver_location); } - nir_foreach_variable_with_modes(var, c->s, nir_var_mem_ssbo) { + for (int i = 0; i < c->s->info.num_ssbos; i++) { /* XXX: nv50 uses the atomic flag to set caching for (lowered) atomic * counters */ bool atomic = false; - ureg_DECL_buffer(c->ureg, var->data.binding, atomic); + ureg_DECL_buffer(c->ureg, i, atomic); } for (int i = 0; i < PIPE_MAX_SAMPLERS; i++) {