Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/context.c

1 files changed, 1 insertions, 1 deletions

diff --git a/src/mesa/drivers/dri/i915tex/intel_regions.h b/src/mesa/drivers/dri/i915tex/intel_regions.h
index 1415bace69..d938c107a4 100644
--- a/src/mesa/drivers/dri/i915tex/intel_regions.h
+++ b/src/mesa/drivers/dri/i915tex/intel_regions.h
@@ -103,7 +103,7 @@ void intel_region_data(intelScreenPrivate *intelScreen,
                        struct intel_region *dest,
                        GLuint dest_offset,
                        GLuint destx, GLuint desty,
-                       void *src, GLuint src_stride,
+                       const void *src, GLuint src_stride,
                        GLuint srcx, GLuint srcy, GLuint width, GLuint height);
 
 /* Copy rectangular sub-regions