mesa: GL_ARB_shader_objects is not optional

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

diff --git a/src/mesa/drivers/dri/i915/intel_blit.h b/src/mesa/drivers/dri/i915/intel_blit.h
index a66af8635914f76aecde3f69a766ccdf3ecc1c99..0decc80a6e0bcf0bfc862803b0cdb2ba5b4bd62e 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_blit.h
+++ b/src/mesa/drivers/dri/i915/intel_blit.h
@@ -29,34 +29,55 @@
 #define INTEL_BLIT_H
 
 #include "intel_context.h"
-#include "intel_ioctl.h"
-#include "dri_bufmgr.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 GLbitfield intelClearWithBlit(struct gl_context * ctx, GLbitfield mask);
 
-extern void intelEmitCopyBlit(struct intel_context *intel,
+bool
+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,
                               GLshort dstx, GLshort dsty,
                               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,
-                              GLshort x, GLshort y,
-                              GLshort w, GLshort h, GLuint color);
+bool intel_miptree_blit(struct intel_context *intel,
+                        struct intel_mipmap_tree *src_mt,
+                        int src_level, int src_slice,
+                        uint32_t src_x, uint32_t src_y, bool src_flip,
+                        struct intel_mipmap_tree *dst_mt,
+                        int dst_level, int dst_slice,
+                        uint32_t dst_x, uint32_t dst_y, bool dst_flip,
+                        uint32_t width, uint32_t height,
+                        GLenum logicop);
 
+bool
+intelEmitImmediateColorExpandBlit(struct intel_context *intel,
+                                 GLuint cpp,
+                                 GLubyte *src_bits, GLuint src_size,
+                                 GLuint fg_color,
+                                 GLshort dst_pitch,
+                                 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