Mesa (master): tgsi/ureg: don't call tgsi_sanity when it's too slow

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Aug 23 22:07:30 UTC 2018


Module: Mesa
Branch: master
Commit: 8c71b70f07a3efea713c27d058fba32ce1b84374
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c71b70f07a3efea713c27d058fba32ce1b84374

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Aug  8 15:07:51 2018 -0400

tgsi/ureg: don't call tgsi_sanity when it's too slow

Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

---

 src/gallium/auxiliary/tgsi/tgsi_ureg.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index 92c98c763e..c1c8851486 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -2106,7 +2106,18 @@ const struct tgsi_token *ureg_finalize( struct ureg_program *ureg )
    }
 
 #if DEBUG
-   if (tokens && !tgsi_sanity_check(tokens)) {
+   /* tgsi_sanity doesn't seem to return if there are too many constants. */
+   bool too_many_constants = false;
+   for (unsigned i = 0; i < ARRAY_SIZE(ureg->const_decls); i++) {
+      for (unsigned j = 0; j < ureg->const_decls[i].nr_constant_ranges; j++) {
+         if (ureg->const_decls[i].constant_range[j].last > 4096) {
+            too_many_constants = true;
+            break;
+         }
+      }
+   }
+
+   if (tokens && !too_many_constants && !tgsi_sanity_check(tokens)) {
       debug_printf("tgsi_ureg.c, sanity check failed on generated tokens:\n");
       tgsi_dump(tokens, 0);
       assert(0);




More information about the mesa-commit mailing list