diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-21 11:57:30 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-21 11:57:30 -0600 |
| commit | 23d31efc167f09d47635352f697ffcb087d3ebbd (patch) | |
| tree | 782f5bdcda8a4374501cae05a94a024fe1c26777 /src/mesa/swrast/s_readpix.c | |
| parent | 180cc2f8458c13ce415f7cdf9a425ae59cb6ad8b (diff) | |
| parent | 88db19a48412cbe89196b1cc06e8ecf8ccae78b0 (diff) | |
merge from master
Diffstat (limited to 'src/mesa/swrast/s_readpix.c')
| -rw-r--r-- | src/mesa/swrast/s_readpix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 383d61ce06..fe9a70f4ea 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -119,7 +119,7 @@ read_depth_pixels( GLcontext *ctx, && !biasOrScale && !packing->SwapBytes) { /* Special case: directly read 24-bit unsigned depth values. */ GLint j; - ASSERT(rb->InternalFormat == GL_DEPTH_COMPONENT32); + ASSERT(rb->InternalFormat == GL_DEPTH_COMPONENT24); ASSERT(rb->DataType == GL_UNSIGNED_INT); for (j = 0; j < height; j++, y++) { GLuint *dest = (GLuint *) @@ -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 */ |