From: José Fonseca <jfonseca@vmware.com>
Date: Sat, 17 Apr 2010 13:00:13 +0000 (+0200)
Subject: trace: Handle transfers with zero strides correctly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53c3c914a786a4a579532671bd9cb79b41cae78d;p=mesa.git

trace: Handle transfers with zero strides correctly.
---

diff --git a/src/gallium/drivers/trace/tr_dump.c b/src/gallium/drivers/trace/tr_dump.c
index 8ff25fb1e85..51a4ea96335 100644
--- a/src/gallium/drivers/trace/tr_dump.c
+++ b/src/gallium/drivers/trace/tr_dump.c
@@ -478,8 +478,16 @@ void trace_dump_box_bytes(const void *data,
 			  unsigned stride,
 			  unsigned slice_stride)
 {
-   size_t size = MAX2(util_format_get_nblocksy(format, box->height) * stride,
-                      box->depth * slice_stride);
+   size_t size;
+
+   if (slice_stride)
+      size = box->depth * slice_stride;
+   else if (stride)
+      size = util_format_get_nblocksy(format, box->height) * stride;
+   else {
+      size = util_format_get_nblocksx(format, box->width) * util_format_get_blocksize(format);
+   }
+
    trace_dump_bytes(data, size);
 }