summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-08-23 14:32:06 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-08-23 14:32:06 +0000
commit732dd6f4173917ca1e21901b9c3fa29dbd5f019f (patch)
tree793614bc34e348cb7081bc121fa361784e38c1e4
parent147b08328a2ccb0c1150feaf7871037683236e33 (diff)
enabling 1D convolution caused a problem
-rw-r--r--src/mesa/main/drawpix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 3cf40956ab..562db485b5 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.29 2000/08/21 14:24:10 brianp Exp $ */
+/* $Id: drawpix.c,v 1.30 2000/08/23 14:32:06 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -739,7 +739,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
quickDraw = GL_FALSE;
}
- if (ctx->ImageTransferState & IMAGE_CONVOLUTION_BIT) {
+ if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
/* Convolution has to be handled specially. We'll create an
* intermediate image, applying all pixel transfer operations
* up to convolution. Then we'll convolve the image. Then
@@ -788,10 +788,10 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
if (ctx->Pixel.Convolution2DEnabled) {
_mesa_convolve_2d_image(ctx, &width, &height, tmpImage, convImage);
}
- else if (ctx->Pixel.Separable2DEnabled) {
+ else {
+ ASSERT(ctx->Pixel.Separable2DEnabled);
_mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
}
-
FREE(tmpImage);
/* continue transfer ops and draw the convolved image */