Mesa (master): nouveau: allow more tokens by default to avoid parse failures

Ilia Mirkin imirkin at kemper.freedesktop.org
Fri Aug 29 01:56:57 UTC 2014


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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Thu Aug 28 21:52:13 2014 -0400

nouveau: allow more tokens by default to avoid parse failures

Also print a note saying that parsing failed to help isolate issues.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/nouveau/nouveau_compiler.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_compiler.c b/src/gallium/drivers/nouveau/nouveau_compiler.c
index ac22035..8660498 100644
--- a/src/gallium/drivers/nouveau/nouveau_compiler.c
+++ b/src/gallium/drivers/nouveau/nouveau_compiler.c
@@ -139,7 +139,7 @@ nouveau_codegen(int chipset, int type, struct tgsi_token tokens[],
 int
 main(int argc, char *argv[])
 {
-   struct tgsi_token tokens[1024];
+   struct tgsi_token tokens[4096];
    int i, chipset = 0, type = -1;
    const char *filename = NULL;
    FILE *f;
@@ -195,8 +195,10 @@ main(int argc, char *argv[])
       return 1;
    }
 
-   if (!tgsi_text_translate(text, tokens, Elements(tokens)))
+   if (!tgsi_text_translate(text, tokens, Elements(tokens))) {
+      _debug_printf("Failed to parse TGSI shader\n");
       return 1;
+   }
 
    if (chipset >= 0x50) {
       i = nouveau_codegen(chipset, type, tokens, &size, &code);




More information about the mesa-commit mailing list