Module: Mesa
Branch: master
Commit: ec0bab8ca9eaed4648cf9e90398606fa4fc6e747
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec0bab8ca9eaed4648cf9e90398606fa4fc6e747
Author: Eric Anholt <e...@anholt.net>
Date: Fri Dec 11 13:11:26 2020 -0800
gallium/ntt: Fix emitting UBO declarations.
Fixes: d70fff99c5bc ("nir: Use a single list for all shader variables")
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8196>
---
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);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
