From: Brian Paul <brianp@vmware.com>
Date: Wed, 11 Feb 2009 21:09:22 +0000 (-0700)
Subject: gallium: silence warnings about void ptr arithmetic
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=81374d1ebed16aa3eed336295e80be0dfebfad75;p=mesa.git

gallium: silence warnings about void ptr arithmetic
---

diff --git a/src/gallium/auxiliary/util/u_linear.c b/src/gallium/auxiliary/util/u_linear.c
index a76704ffc7f..ba6204d6f77 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;
 	 }
       }