Merge branch 'master' into gallium-texture-transfer

Conflicts:

	src/mesa/state_tracker/st_cb_accum.c
	src/mesa/state_tracker/st_cb_drawpixels.c

2 files changed, 14 insertions, 12 deletions

diff --git a/src/gallium/auxiliary/util/u_linear.c b/src/gallium/auxiliary/util/u_linear.c
index a76704ffc7..e999cefe74 100644
--- a/src/gallium/auxiliary/util/u_linear.c
+++ b/src/gallium/auxiliary/util/u_linear.c
@@ -3,13 +3,13 @@
 #include "u_linear.h"
 
 void
-pipe_linear_to_tile(size_t src_stride, void *src_ptr,
+pipe_linear_to_tile(size_t src_stride, const void *src_ptr,
 		    struct pipe_tile_info *t, void *dst_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,20 +19,21 @@ 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;
 	 }
       }
    }
 }
 
-void pipe_linear_from_tile(struct pipe_tile_info *t, void  *src_ptr,
+void pipe_linear_from_tile(struct pipe_tile_info *t, const void *src_ptr,
 			   size_t dst_stride, void *dst_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;
 	 }
       }
@@ -50,7 +51,7 @@ void pipe_linear_from_tile(struct pipe_tile_info *t, void  *src_ptr,
 
 void
 pipe_linear_fill_info(struct pipe_tile_info *t,
-		      struct pipe_format_block *block,
+		      const struct pipe_format_block *block,
 		      unsigned tile_width, unsigned tile_height,
 		      unsigned tiles_x, unsigned tiles_y)
 {
diff --git a/src/gallium/auxiliary/util/u_linear.h b/src/gallium/auxiliary/util/u_linear.h
index e337cfd770..1589f029bc 100644
--- a/src/gallium/auxiliary/util/u_linear.h
+++ b/src/gallium/auxiliary/util/u_linear.h
@@ -3,6 +3,7 @@
 #define U_LINEAR_H
 
 #include "pipe/p_format.h"
+
 struct pipe_tile_info
 {
    unsigned size;
@@ -23,10 +24,10 @@ struct pipe_tile_info
    struct pipe_format_block block;
 };
 
-void pipe_linear_to_tile(size_t src_stride, void *src_ptr,
+void pipe_linear_to_tile(size_t src_stride, const void *src_ptr,
 			 struct pipe_tile_info *t, void  *dst_ptr);
 
-void pipe_linear_from_tile(struct pipe_tile_info *t, void  *src_ptr,
+void pipe_linear_from_tile(struct pipe_tile_info *t, const void *src_ptr,
 			   size_t dst_stride, void *dst_ptr);
 
 /**
@@ -39,11 +40,11 @@ void pipe_linear_from_tile(struct pipe_tile_info *t, void  *src_ptr,
  * @tiles_y number of tiles in y axis
  */
 void pipe_linear_fill_info(struct pipe_tile_info *t,
-			   struct pipe_format_block *block,
+			   const struct pipe_format_block *block,
 			   unsigned tile_width, unsigned tile_height,
 			   unsigned tiles_x, unsigned tiles_y);
 
-static INLINE boolean pipe_linear_check_tile(struct pipe_tile_info *t)
+static INLINE boolean pipe_linear_check_tile(const struct pipe_tile_info *t)
 {
    if (t->tile.size != t->block.size * t->cols * t->rows)
       return FALSE;