intel: Remove unneded pthread mutex in LOCK_HARDWARE.

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

diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h
index 4b120ba4cee6c62bc0c4b5f8df5ff355a66075d5..0d379bdc6e273c2483c3cb279fb668fbcefbfe6d 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_regions.h
+++ b/src/mesa/drivers/dri/intel/intel_regions.h
@@ -73,8 +73,10 @@ struct intel_region
  * copied by calling intel_reference_region().
  */
 struct intel_region *intel_region_alloc(struct intel_context *intel,
-                                        GLuint cpp, GLuint width,
-                                        GLuint height, GLuint pitch);
+                                        uint32_t tiling,
+                                       GLuint cpp, GLuint width,
+                                        GLuint height, GLuint pitch,
+                                       GLboolean expect_accelerated_upload);
 
 struct intel_region *
 intel_region_alloc_for_handle(struct intel_context *intel,
@@ -108,21 +110,15 @@ void intel_region_data(struct intel_context *intel,
 
 /* Copy rectangular sub-regions
  */
-void intel_region_copy(struct intel_context *intel,
-                       struct intel_region *dest,
-                       GLuint dest_offset,
-                       GLuint destx, GLuint desty,
-                       struct intel_region *src,
-                       GLuint src_offset,
-                       GLuint srcx, GLuint srcy, GLuint width, GLuint height);
-
-/* Fill a rectangular sub-region
- */
-void intel_region_fill(struct intel_context *intel,
-                       struct intel_region *dest,
-                       GLuint dest_offset,
-                       GLuint destx, GLuint desty,
-                       GLuint width, GLuint height, GLuint color);
+GLboolean
+intel_region_copy(struct intel_context *intel,
+                 struct intel_region *dest,
+                 GLuint dest_offset,
+                 GLuint destx, GLuint desty,
+                 struct intel_region *src,
+                 GLuint src_offset,
+                 GLuint srcx, GLuint srcy, GLuint width, GLuint height,
+                 GLenum logicop);
 
 /* Helpers for zerocopy uploads, particularly texture image uploads:
  */