i965: Fix PBO cache coherency issue after _mesa_meta_pbo_GetTexSubImage().

[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 0decc80a6e0bcf0bfc862803b0cdb2ba5b4bd62e..f563939fdd93c24c685eb0806e8ed6120c806340 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_blit.h
+++ b/src/mesa/drivers/dri/i965/intel_blit.h
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ *
+ * Copyright 2003 VMware, Inc.
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -10,33 +10,28 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  **************************************************************************/
 
 #ifndef INTEL_BLIT_H
 #define INTEL_BLIT_H
 
-#include "intel_context.h"
-
-extern void intelCopyBuffer(const __DRIdrawable * dpriv,
-                            const drm_clip_rect_t * rect);
-
-extern GLbitfield intelClearWithBlit(struct gl_context * ctx, GLbitfield mask);
+#include "brw_context.h"
 
 bool
-intelEmitCopyBlit(struct intel_context *intel,
+intelEmitCopyBlit(struct brw_context *brw,
                               GLuint cpp,
                               GLshort src_pitch,
                               drm_intel_bo *src_buffer,
@@ -51,7 +46,7 @@ intelEmitCopyBlit(struct intel_context *intel,
                               GLshort w, GLshort h,
                              GLenum logicop );
 
-bool intel_miptree_blit(struct intel_context *intel,
+bool intel_miptree_blit(struct brw_context *brw,
                         struct intel_mipmap_tree *src_mt,
                         int src_level, int src_slice,
                         uint32_t src_x, uint32_t src_y, bool src_flip,
@@ -62,7 +57,7 @@ bool intel_miptree_blit(struct intel_context *intel,
                         GLenum logicop);
 
 bool
-intelEmitImmediateColorExpandBlit(struct intel_context *intel,
+intelEmitImmediateColorExpandBlit(struct brw_context *brw,
                                  GLuint cpp,
                                  GLubyte *src_bits, GLuint src_size,
                                  GLuint fg_color,
@@ -73,7 +68,7 @@ intelEmitImmediateColorExpandBlit(struct intel_context *intel,
                                  GLshort x, GLshort y,
                                  GLshort w, GLshort h,
                                  GLenum logic_op);
-void intel_emit_linear_blit(struct intel_context *intel,
+void intel_emit_linear_blit(struct brw_context *brw,
                            drm_intel_bo *dst_bo,
                            unsigned int dst_offset,
                            drm_intel_bo *src_bo,