Mesa (master): trace: Handle transfers with zero strides correctly.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Apr 18 08:38:10 UTC 2010
Module: Mesa
Branch: master
Commit: 53c3c914a786a4a579532671bd9cb79b41cae78d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=53c3c914a786a4a579532671bd9cb79b41cae78d
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat Apr 17 15:00:13 2010 +0200
trace: Handle transfers with zero strides correctly.
---
src/gallium/drivers/trace/tr_dump.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/trace/tr_dump.c b/src/gallium/drivers/trace/tr_dump.c
index 8ff25fb..51a4ea9 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);
}
More information about the mesa-commit
mailing list