fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enabling 1D convolution caused a problem

Browse source
This commit is contained in:
Brian Paul 2000-08-23 14:32:06 +00:00
parent 147b08328a
commit 732dd6f417
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/main/drawpix.c
View file

@ -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 */