Mesa (master): trace: Handle null tokens.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Aug 22 11:14:51 UTC 2013


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jul 31 18:31:44 2013 +0100

trace: Handle null tokens.

Used for example on stream out without geometry shader.

---

 src/gallium/drivers/trace/tr_dump_state.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/trace/tr_dump_state.c b/src/gallium/drivers/trace/tr_dump_state.c
index 7d10df7..e11f866 100644
--- a/src/gallium/drivers/trace/tr_dump_state.c
+++ b/src/gallium/drivers/trace/tr_dump_state.c
@@ -266,12 +266,16 @@ void trace_dump_shader_state(const struct pipe_shader_state *state)
       return;
    }
 
-   tgsi_dump_str(state->tokens, 0, str, sizeof(str));
 
    trace_dump_struct_begin("pipe_shader_state");
 
    trace_dump_member_begin("tokens");
-   trace_dump_string(str);
+   if (state->tokens) {
+      tgsi_dump_str(state->tokens, 0, str, sizeof(str));
+      trace_dump_string(str);
+   } else {
+      trace_dump_null();
+   }
    trace_dump_member_end();
 
    trace_dump_member_begin("stream_output");




More information about the mesa-commit mailing list