Merge branch 'lp-offset-twoside'

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

diff --git a/src/mesa/drivers/dri/intel/intel_blit.h b/src/mesa/drivers/dri/intel/intel_blit.h
index 52065b13ed73dc740046eb3001ac6621cda53cb1..01631465735323d9fc08f76f59084d11f1f10b7f 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_blit.h
+++ b/src/mesa/drivers/dri/intel/intel_blit.h
@@ -30,19 +30,20 @@
 
 #include "intel_context.h"
 
-extern void intelCopyBuffer(const __DRIdrawablePrivate * dpriv,
+extern void intelCopyBuffer(const __DRIdrawable * dpriv,
                             const drm_clip_rect_t * rect);
 
-extern void intelClearWithBlit(GLcontext * ctx, GLbitfield mask);
+extern void intelClearWithBlit(struct gl_context * ctx, GLbitfield mask);
 
-extern void intelEmitCopyBlit(struct intel_context *intel,
+GLboolean
+intelEmitCopyBlit(struct intel_context *intel,
                               GLuint cpp,
                               GLshort src_pitch,
-                              dri_bo *src_buffer,
+                              drm_intel_bo *src_buffer,
                               GLuint src_offset,
                              uint32_t src_tiling,
                               GLshort dst_pitch,
-                              dri_bo *dst_buffer,
+                              drm_intel_bo *dst_buffer,
                               GLuint dst_offset,
                              uint32_t dst_tiling,
                               GLshort srcx, GLshort srcy,
@@ -50,26 +51,23 @@ extern void intelEmitCopyBlit(struct intel_context *intel,
                               GLshort w, GLshort h,
                              GLenum logicop );
 
-extern void intelEmitFillBlit(struct intel_context *intel,
-                              GLuint cpp,
-                              GLshort dst_pitch,
-                              dri_bo *dst_buffer,
-                              GLuint dst_offset,
-                             uint32_t dst_tiling,
-                              GLshort x, GLshort y,
-                              GLshort w, GLshort h, GLuint color);
-
-void
+GLboolean
 intelEmitImmediateColorExpandBlit(struct intel_context *intel,
                                  GLuint cpp,
                                  GLubyte *src_bits, GLuint src_size,
                                  GLuint fg_color,
                                  GLshort dst_pitch,
-                                 dri_bo *dst_buffer,
+                                 drm_intel_bo *dst_buffer,
                                  GLuint dst_offset,
                                  uint32_t dst_tiling,
                                  GLshort x, GLshort y,
                                  GLshort w, GLshort h,
                                  GLenum logic_op);
+void intel_emit_linear_blit(struct intel_context *intel,
+                           drm_intel_bo *dst_bo,
+                           unsigned int dst_offset,
+                           drm_intel_bo *src_bo,
+                           unsigned int src_offset,
+                           unsigned int size);
 
 #endif