Mesa (mesa_7_7_branch): i965: Enable the accelerated ReadPixels path on gen4 along with pre-gen4.

[Eric Anholt]

Module: Mesa
Branch: mesa_7_7_branch
Commit: dd9eb8774ad7918187afebf8cd3be6f4b80f0f3b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd9eb8774ad7918187afebf8cd3be6f4b80f0f3b

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec  8 16:15:07 2009 -0800

i965: Enable the accelerated ReadPixels path on gen4 along with pre-gen4.

Passes piglit pbo-read-argb8888, and doesn't otherwise regress quick.tests.

---

 src/mesa/drivers/dri/intel/intel_pixel_read.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_read.c b/src/mesa/drivers/dri/intel/intel_pixel_read.c
index 4707500..20424e2 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_read.c
@@ -285,11 +285,11 @@ intelReadPixels(GLcontext * ctx,
 
    intelFlush(ctx);
 
-#ifdef I915
    if (do_blit_readpixels
        (ctx, x, y, width, height, format, type, pack, pixels))
       return;
 
+#ifdef I915
    if (do_texture_readpixels
        (ctx, x, y, width, height, format, type, pack, pixels))
       return;