intel: Merge check_blit_fragment_ops between i915/i965.

Both had some useful bits for the other.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c
index c0333969d0..72eb823bc4 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel.c
@@ -99,6 +99,11 @@ intel_check_blit_fragment_ops(GLcontext * ctx)
       return GL_FALSE;
    }
 
+   if (ctx->RenderMode != GL_RENDER) {
+      DBG("fallback due to render mode\n");
+      return GL_FALSE;
+   }
+
    return GL_TRUE;
 }
 
@@ -157,7 +162,9 @@ intelInitPixelFuncs(struct dd_function_table *functions)
    if (!getenv("INTEL_NO_BLIT")) {
       functions->Bitmap = intelBitmap;
       functions->CopyPixels = intelCopyPixels;
+#ifdef I915
       functions->ReadPixels = intelReadPixels;
       functions->DrawPixels = intelDrawPixels;
+#endif
    }
 }