Mesa (master): ttn: set ->info->num_ubos
Rob Clark
robclark at kemper.freedesktop.org
Tue Dec 27 22:03:30 UTC 2016
Module: Mesa
Branch: master
Commit: 859cb24d94f3b0b7f8f0e98642ff4b92b1f7f2f1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=859cb24d94f3b0b7f8f0e98642ff4b92b1f7f2f1
Author: Rob Clark <robdclark at gmail.com>
Date: Thu Dec 22 00:56:48 2016 -0500
ttn: set ->info->num_ubos
For dealing w/ 32b vs 64b gpu addresses, I need to rework how we pass
UBO buffer addresses to shader, and knowing up front the # of UBOs is
useful. But I noticed ttn wasn't setting this.
Signed-off-by: Rob Clark <robdclark at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/gallium/auxiliary/nir/tgsi_to_nir.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index f50a5a6..c7afe96 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -314,8 +314,11 @@ ttn_emit_declaration(struct ttn_compile *c)
file == TGSI_FILE_CONSTANT);
/* nothing to do for UBOs: */
- if ((file == TGSI_FILE_CONSTANT) && decl->Declaration.Dimension)
+ if ((file == TGSI_FILE_CONSTANT) && decl->Declaration.Dimension) {
+ b->shader->info->num_ubos =
+ MAX2(b->shader->info->num_ubos, decl->Dim.Index2D);
return;
+ }
if ((file == TGSI_FILE_INPUT) || (file == TGSI_FILE_OUTPUT)) {
is_array = (is_array && decl->Declaration.Array &&
More information about the mesa-commit
mailing list