3 files changed, 65 insertions, 5 deletions
diff --git a/src/gallium/drivers/trace/tr_dump.c b/src/gallium/drivers/trace/tr_dump.c
index 3a1409e95a..643587ab42 100644
--- a/src/gallium/drivers/trace/tr_dump.c
+++ b/src/gallium/drivers/trace/tr_dump.c
@@ -451,11 +451,11 @@ void trace_dump_float(double value)
 }
 
 void trace_dump_bytes(const void *data,
-                      long unsigned size)
+                      size_t size)
 {
    static const char hex_table[16] = "0123456789ABCDEF";
    const uint8_t *p = data;
-   long unsigned i;
+   size_t i;
 
    if (!dumping)
       return;
diff --git a/src/gallium/drivers/trace/tr_dump.h b/src/gallium/drivers/trace/tr_dump.h
index 31ac70802f..32592bab12 100644
--- a/src/gallium/drivers/trace/tr_dump.h
+++ b/src/gallium/drivers/trace/tr_dump.h
@@ -91,7 +91,7 @@ void trace_dump_bool(int value);
 void trace_dump_int(long long int value);
 void trace_dump_uint(long long unsigned value);
 void trace_dump_float(double value);
-void trace_dump_bytes(const void *data, long unsigned size);
+void trace_dump_bytes(const void *data, size_t size);
 void trace_dump_string(const char *str);
 void trace_dump_enum(const char *value);
 void trace_dump_array_begin(void);
@@ -130,7 +130,7 @@ void trace_dump_transfer_ptr(struct pipe_transfer *_transfer);
 
 #define trace_dump_array(_type, _obj, _size) \
    do { \
-      unsigned long idx; \
+      size_t idx; \
       trace_dump_array_begin(); \
       for(idx = 0; idx < (_size); ++idx) { \
          trace_dump_elem_begin(); \
@@ -142,7 +142,7 @@ void trace_dump_transfer_ptr(struct pipe_transfer *_transfer);
 
 #define trace_dump_struct_array(_type, _obj, _size) \
    do { \
-      unsigned long idx; \
+      size_t idx; \
       trace_dump_array_begin(); \
       for(idx = 0; idx < (_size); ++idx) { \
          trace_dump_elem_begin(); \
diff --git a/src/gallium/drivers/trace/tr_dump_state.c b/src/gallium/drivers/trace/tr_dump_state.c
index 23a2473b57..f9a24b611b 100644
--- a/src/gallium/drivers/trace/tr_dump_state.c
+++ b/src/gallium/drivers/trace/tr_dump_state.c
@@ -36,12 +36,18 @@
 
 void trace_dump_format(enum pipe_format format)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    trace_dump_enum(pf_name(format) );
 }
 
 
 void trace_dump_block(const struct pipe_format_block *block)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    trace_dump_struct_begin("pipe_format_block");
    trace_dump_member(uint, block, size);
    trace_dump_member(uint, block, width);
@@ -52,6 +58,9 @@ void trace_dump_block(const struct pipe_format_block *block)
 
 static void trace_dump_reference(const struct pipe_reference *reference)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    trace_dump_struct_begin("pipe_reference");
    trace_dump_member(int, &reference->count, count);
    trace_dump_struct_end();
@@ -60,6 +69,9 @@ static void trace_dump_reference(const struct pipe_reference *reference)
 
 void trace_dump_template(const struct pipe_texture *templat)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!templat) {
       trace_dump_null();
       return;
@@ -95,6 +107,9 @@ void trace_dump_template(const struct pipe_texture *templat)
 
 void trace_dump_rasterizer_state(const struct pipe_rasterizer_state *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -141,6 +156,9 @@ void trace_dump_rasterizer_state(const struct pipe_rasterizer_state *state)
 
 void trace_dump_poly_stipple(const struct pipe_poly_stipple *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -160,6 +178,9 @@ void trace_dump_poly_stipple(const struct pipe_poly_stipple *state)
 
 void trace_dump_viewport_state(const struct pipe_viewport_state *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -176,6 +197,9 @@ void trace_dump_viewport_state(const struct pipe_viewport_state *state)
 
 void trace_dump_scissor_state(const struct pipe_scissor_state *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -196,6 +220,9 @@ void trace_dump_clip_state(const struct pipe_clip_state *state)
 {
    unsigned i;
 
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -221,6 +248,9 @@ void trace_dump_clip_state(const struct pipe_clip_state *state)
 
 void trace_dump_constant_buffer(const struct pipe_constant_buffer *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -238,6 +268,9 @@ void trace_dump_shader_state(const struct pipe_shader_state *state)
 {
    static char str[8192];
 
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -259,6 +292,9 @@ void trace_dump_depth_stencil_alpha_state(const struct pipe_depth_stencil_alpha_
 {
    unsigned i;
 
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -307,6 +343,9 @@ void trace_dump_depth_stencil_alpha_state(const struct pipe_depth_stencil_alpha_
 
 void trace_dump_blend_state(const struct pipe_blend_state *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -336,6 +375,9 @@ void trace_dump_blend_state(const struct pipe_blend_state *state)
 
 void trace_dump_blend_color(const struct pipe_blend_color *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -351,6 +393,9 @@ void trace_dump_blend_color(const struct pipe_blend_color *state)
 
 void trace_dump_framebuffer_state(const struct pipe_framebuffer_state *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    trace_dump_struct_begin("pipe_framebuffer_state");
 
    trace_dump_member(uint, state, width);
@@ -365,6 +410,9 @@ void trace_dump_framebuffer_state(const struct pipe_framebuffer_state *state)
 
 void trace_dump_sampler_state(const struct pipe_sampler_state *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -395,6 +443,9 @@ void trace_dump_sampler_state(const struct pipe_sampler_state *state)
 
 void trace_dump_surface(const struct pipe_surface *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -423,6 +474,9 @@ void trace_dump_surface(const struct pipe_surface *state)
 
 void trace_dump_transfer(const struct pipe_transfer *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -454,6 +508,9 @@ void trace_dump_transfer(const struct pipe_transfer *state)
 
 void trace_dump_vertex_buffer(const struct pipe_vertex_buffer *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;
@@ -472,6 +529,9 @@ void trace_dump_vertex_buffer(const struct pipe_vertex_buffer *state)
 
 void trace_dump_vertex_element(const struct pipe_vertex_element *state)
 {
+   if (!trace_dumping_enabled_locked())
+      return;
+
    if(!state) {
       trace_dump_null();
       return;