1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 5f19137d58..d65de633fd 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -258,7 +258,6 @@ void intelInitDriverFunctions( struct dd_function_table *functions )
    /* Pixel path fallbacks.
     */
    functions->Accum = _swrast_Accum;
-   functions->Bitmap = _swrast_Bitmap;
    functions->ReadPixels = _swrast_ReadPixels;
    functions->DrawPixels = _swrast_DrawPixels;
 
@@ -266,6 +265,12 @@ void intelInitDriverFunctions( struct dd_function_table *functions )
     * manager:
     */
    functions->CopyPixels = intelCopyPixels;
+   functions->Bitmap = intelBitmap;
+
+   if (getenv("INTEL_NO_BLIT")) {
+      functions->Bitmap = _swrast_Bitmap;
+      functions->CopyPixels = _swrast_CopyPixels;
+   }
 
    intelInitTextureFuncs( functions );
    intelInitStateFuncs( functions );