Structure CopyPixels similarly to i915 do_texture_copypixels, to ease future unification.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index a8f7a61ba3..8367a95710 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -86,12 +86,6 @@ struct intel_texture_object
 
 
 
-/* Identifiers for use with install_meta_state below */
-enum
-{
-   META_FULL, META_VERTEX_ONLY
-};
-
 struct intel_context
 {
    GLcontext ctx;		/* the parent class */
@@ -137,8 +131,7 @@ struct intel_context
 
       /* Metaops: 
        */
-      void (*install_meta_state)( struct intel_context *intel,
-				  GLenum state );
+      void (*install_meta_state)( struct intel_context *intel );
       void (*leave_meta_state)( struct intel_context *intel );
 
       void (*meta_draw_region)( struct intel_context *intel,
@@ -154,9 +147,12 @@ struct intel_context
 
       void (*meta_depth_replace)( struct intel_context *intel );
 
+      void (*meta_texture_blend_replace) (struct intel_context * intel);
+      
       void (*meta_no_stencil_write)( struct intel_context *intel );
       void (*meta_no_depth_write)( struct intel_context *intel );
       void (*meta_no_texture)( struct intel_context *intel );
+      void (*meta_import_pixel_state) (struct intel_context * intel);
       void (*meta_frame_buffer_texture)( struct intel_context *intel,
 					 GLint xoff, GLint yoff );