Merge branch 'master' into crestline

[mesa.git] / src / mesa / drivers / dri / i965 / intel_regions.h

diff --git a/src/mesa/drivers/dri/i965/intel_regions.h b/src/mesa/drivers/dri/i965/intel_regions.h
index 9f5483150c0852320f0589f9f931b359cf3eb7b1..2413f0de33c16e8a2988ae185f0bbdcf064ab6b3 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_regions.h
+++ b/src/mesa/drivers/dri/i965/intel_regions.h
@@ -91,13 +91,13 @@ void intel_region_unmap(struct intel_context *intel,
 
 /* Upload data to a rectangular sub-region
  */
-void intel_region_data(struct intel_context *intel, 
-                      struct intel_region *dest,
-                      GLuint dest_offset,
-                      GLuint destx, GLuint desty,
-                      const void *src, GLuint src_stride,
-                      GLuint srcx, GLuint srcy,
-                      GLuint width, GLuint height);
+GLboolean intel_region_data(struct intel_context *intel, 
+                           struct intel_region *dest,
+                           GLuint dest_offset,
+                           GLuint destx, GLuint desty,
+                           const void *src, GLuint src_stride,
+                           GLuint srcx, GLuint srcy,
+                           GLuint width, GLuint height);
                          
 /* Copy rectangular sub-regions
  */