mesa: add bool param to _mesa_free_context_data

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

diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/intel_blit.h
index 5e4d1f5eb4acba62ef36962bb9adab407de7fe8f..babdfa4ba725f7c687f97237a73c88f5664e2fa9 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_blit.h
+++ b/src/mesa/drivers/dri/i965/intel_blit.h
@@ -28,35 +28,6 @@
 
 #include "brw_context.h"
 
-static inline unsigned
-isl_tiling_to_bufmgr_tiling(enum isl_tiling tiling)
-{
-   if (tiling == ISL_TILING_X)
-      return I915_TILING_X;
-
-   if (tiling == ISL_TILING_Y0)
-      return I915_TILING_Y;
-
-   /* All other are unknown to buffer allocator. */
-   return I915_TILING_NONE;
-}
-
-bool
-intelEmitCopyBlit(struct brw_context *brw,
-                  GLuint cpp,
-                  int32_t src_pitch,
-                  struct brw_bo *src_buffer,
-                  GLuint src_offset,
-                  uint32_t src_tiling,
-                  int32_t dst_pitch,
-                  struct brw_bo *dst_buffer,
-                  GLuint dst_offset,
-                  uint32_t dst_tiling,
-                  GLshort srcx, GLshort srcy,
-                  GLshort dstx, GLshort dsty,
-                  GLshort w, GLshort h,
-                  GLenum logicop);
-
 bool intel_miptree_blit_compatible_formats(mesa_format src, mesa_format dst);
 
 bool intel_miptree_blit(struct brw_context *brw,
@@ -67,7 +38,7 @@ bool intel_miptree_blit(struct brw_context *brw,
                         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);
+                        enum gl_logicop_mode logicop);
 
 bool intel_miptree_copy(struct brw_context *brw,
                         struct intel_mipmap_tree *src_mt,
@@ -86,15 +57,9 @@ intelEmitImmediateColorExpandBlit(struct brw_context *brw,
                                  GLshort dst_pitch,
                                  struct brw_bo *dst_buffer,
                                  GLuint dst_offset,
-                                 uint32_t dst_tiling,
+                                  enum isl_tiling dst_tiling,
                                  GLshort x, GLshort y,
                                  GLshort w, GLshort h,
-                                 GLenum logic_op);
-void intel_emit_linear_blit(struct brw_context *brw,
-                           struct brw_bo *dst_bo,
-                           unsigned int dst_offset,
-                           struct brw_bo *src_bo,
-                           unsigned int src_offset,
-                           unsigned int size);
+                                 enum gl_logicop_mode logic_op);
 
 #endif