summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-11 14:09:22 -0700
committerBrian Paul <brianp@vmware.com>2009-02-11 14:09:22 -0700
commit81374d1ebed16aa3eed336295e80be0dfebfad75 (patch)
tree9f42c39eced1111549313d0b2cd7b2ff1722b715 /src/gallium/auxiliary/util
parentda4f933eb2544b62daf0b3c3bd8e16277dd64117 (diff)
gallium: silence warnings about void ptr arithmetic
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/u_linear.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/util/u_linear.c b/src/gallium/auxiliary/util/u_linear.c
index a76704ffc7..ba6204d6f7 100644
--- a/src/gallium/auxiliary/util/u_linear.c
+++ b/src/gallium/auxiliary/util/u_linear.c
@@ -9,7 +9,7 @@ pipe_linear_to_tile(size_t src_stride, void *src_ptr,
int x, y, z;
char *ptr;
size_t bytes = t->cols * t->block.size;
-
+ char *dst_ptr2 = (char *) dst_ptr;
assert(pipe_linear_check_tile(t));
@@ -19,8 +19,8 @@ pipe_linear_to_tile(size_t src_stride, void *src_ptr,
/* this inner loop could be replace with SSE magic */
ptr = (char*)src_ptr + src_stride * t->rows * y + bytes * x;
for (z = 0; z < t->rows; z++) {
- memcpy(dst_ptr, ptr, bytes);
- dst_ptr += bytes;
+ memcpy(dst_ptr2, ptr, bytes);
+ dst_ptr2 += bytes;
ptr += src_stride;
}
}
@@ -33,6 +33,7 @@ void pipe_linear_from_tile(struct pipe_tile_info *t, void *src_ptr,
int x, y, z;
char *ptr;
size_t bytes = t->cols * t->block.size;
+ const char *src_ptr2 = (const char *) src_ptr;
/* lets read lineary from the tiled buffer */
for (y = 0; y < t->tiles_y; y++) {
@@ -40,8 +41,8 @@ void pipe_linear_from_tile(struct pipe_tile_info *t, void *src_ptr,
/* this inner loop could be replace with SSE magic */
ptr = (char*)dst_ptr + dst_stride * t->rows * y + bytes * x;
for (z = 0; z < t->rows; z++) {
- memcpy(ptr, src_ptr, bytes);
- src_ptr += bytes;
+ memcpy(ptr, src_ptr2, bytes);
+ src_ptr2 += bytes;
ptr += dst_stride;
}
}