summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_readpix.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-21 09:44:03 -0600
committerBrian <brian@yutani.localnet.net>2007-03-21 09:44:03 -0600
commit249b451d2068c781d29a6527e152b39d08b1c877 (patch)
tree28a6c42c2b7be4b559bd099f0b665aa597ca255f /src/mesa/swrast/s_readpix.c
parentc5fe807e426988fc0ef931b417b5b3f621250595 (diff)
1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image transfers.
Diffstat (limited to 'src/mesa/swrast/s_readpix.c')
-rw-r--r--src/mesa/swrast/s_readpix.c4
1 files changed, 4 insertions, 0 deletions
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 */