From 249b451d2068c781d29a6527e152b39d08b1c877 Mon Sep 17 00:00:00 2001
From: Brian <brian@yutani.localnet.net>
Date: Wed, 21 Mar 2007 09:44:03 -0600
Subject: 1D convolution (and post-conv scale/bias) were inadvertantly applied
 to 2D image transfers.

---
 src/mesa/swrast/s_readpix.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/mesa/swrast/s_readpix.c')

diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index c5524c0630..7dc48aec68 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -410,6 +410,10 @@ read_rgba_pixels( GLcontext *ctx,
          = (GLubyte *) _mesa_image_address2d(packing, pixels, width, height,
                                              format, type, 0, 0);
 
+      /* make sure we don't apply 1D convolution */
+      transferOps &= ~(IMAGE_CONVOLUTION_BIT |
+                       IMAGE_POST_CONVOLUTION_SCALE_BIAS);
+
       for (row = 0; row < height; row++, y++) {
 
          /* Get float rgba pixels */
-- 
cgit v1.2.3