diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-21 09:44:03 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-21 09:44:03 -0600 |
| commit | 249b451d2068c781d29a6527e152b39d08b1c877 (patch) | |
| tree | 28a6c42c2b7be4b559bd099f0b665aa597ca255f /src/mesa/swrast/s_drawpix.c | |
| parent | c5fe807e426988fc0ef931b417b5b3f621250595 (diff) | |
1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image transfers.
Diffstat (limited to 'src/mesa/swrast/s_drawpix.c')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index d97d53e83b..99ad71143e 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -619,6 +619,11 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, type = GL_FLOAT; transferOps &= IMAGE_POST_CONVOLUTION_BITS; } + else if (ctx->Pixel.Convolution1DEnabled) { + /* we only want to apply 1D convolution to glTexImage1D */ + transferOps &= ~(IMAGE_CONVOLUTION_BIT | + IMAGE_POST_CONVOLUTION_SCALE_BIAS); + } if (ctx->DrawBuffer->_NumColorDrawBuffers[0] > 0 && ctx->DrawBuffer->_ColorDrawBuffers[0][0]->DataType != GL_FLOAT && |