[Mesa-dev] [PATCH 2/4] tgsi: try and handle overflowing shaders.

[Dave Airlie]

From: Dave Airlie <airl...@redhat.com>

This is used to detect error in virgl if we overflow the shader
dumping buffers.

Signed-off-by: Dave Airlie <airl...@redhat.com>
---
 src/gallium/auxiliary/tgsi/tgsi_dump.c | 10 ++++++++--
 src/gallium/auxiliary/tgsi/tgsi_dump.h |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c 
b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index 33f6a56..f341783 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@ -708,6 +708,7 @@ struct str_dump_ctx
    char *str;
    char *ptr;
    int left;
+   bool nospace;
 };
 
 static void
@@ -730,10 +731,11 @@ str_dump_ctx_printf(struct dump_ctx *ctx, const char 
*format, ...)
          sctx->ptr += written;
          sctx->left -= written;
       }
-   }
+   } else
+      sctx->nospace = true;
 }
 
-void
+int
 tgsi_dump_str(
    const struct tgsi_token *tokens,
    uint flags,
@@ -760,6 +762,7 @@ tgsi_dump_str(
    ctx.str[0] = 0;
    ctx.ptr = str;
    ctx.left = (int)size;
+   ctx.nospace = false;
 
    if (flags & TGSI_DUMP_FLOAT_AS_HEX)
       ctx.base.dump_float_as_hex = TRUE;
@@ -767,6 +770,8 @@ tgsi_dump_str(
       ctx.base.dump_float_as_hex = FALSE;
 
    tgsi_iterate_shader( tokens, &ctx.base.iter );
+
+   return (ctx.nospace == true) ? -1 : 0;
 }
 
 void
@@ -789,6 +794,7 @@ tgsi_dump_instruction_str(
    ctx.str[0] = 0;
    ctx.ptr = str;
    ctx.left = (int)size;
+   ctx.nospace = false;
 
    iter_instruction( &ctx.base.iter, (struct tgsi_full_instruction *)inst );
 }
diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.h 
b/src/gallium/auxiliary/tgsi/tgsi_dump.h
index 6666b98..f800be5 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.h
@@ -40,7 +40,7 @@ extern "C" {
 
 #define TGSI_DUMP_FLOAT_AS_HEX (1 << 0)
 
-void
+int
 tgsi_dump_str(
    const struct tgsi_token *tokens,
    uint flags,
-- 
2.4.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev