From 744357e29c6a51b9e1770e0340eee5105f6b5585 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Jun 2008 11:49:21 -0700
Subject: [PATCH] intel: Same pixel function init for everyone now.

---
 src/mesa/drivers/dri/i915/i830_context.c   | 1 -
 src/mesa/drivers/dri/i915/i915_context.c   | 1 -
 src/mesa/drivers/dri/i965/brw_context.c    | 8 --------
 src/mesa/drivers/dri/intel/intel_context.c | 1 +
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index 240c57c9ad3..acb7178a5cd 100644
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -52,7 +52,6 @@ static void
 i830InitDriverFunctions(struct dd_function_table *functions)
 {
    intelInitDriverFunctions(functions);
-   intelInitPixelFuncs(functions);
    i830InitStateFuncs(functions);
    i830InitTextureFuncs(functions);
 }
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 01619590999..532b402db70 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -94,7 +94,6 @@ static void
 i915InitDriverFunctions(struct dd_function_table *functions)
 {
    intelInitDriverFunctions(functions);
-   intelInitPixelFuncs(functions);
    i915InitStateFunctions(functions);
    i915InitTextureFuncs(functions);
    i915InitFragProgFuncs(functions);
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 1601f6dd248..33f1bba085b 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -65,14 +65,6 @@ static void brwInitDriverFunctions( struct dd_function_table *functions )
 {
    intelInitDriverFunctions( functions );
 
-   /* CopyPixels can be accelerated even with the current memory
-    * manager:
-    */
-   if (!getenv("INTEL_NO_BLIT")) {
-      functions->CopyPixels = intelCopyPixels;
-      functions->Bitmap = intelBitmap;
-   }
-
    brwInitFragProgFuncs( functions );
    brwInitProgFuncs( functions );
 }
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 80e2111b832..671b3f68a3e 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -528,6 +528,7 @@ intelInitDriverFunctions(struct dd_function_table *functions)
    intelInitTextureFuncs(functions);
    intelInitStateFuncs(functions);
    intelInitBufferFuncs(functions);
+   intelInitPixelFuncs(functions);
 }
 
 
-- 
2.30.2