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

mesa: fix convolve/convolution mix-ups

Browse source
This commit is contained in:
Brian 2008-10-06 17:10:45 -06:00
parent f362788eae
commit d055b2c001
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/api_exec.c
View file

@ -58,7 +58,7 @@
#include "colortab.h"
#endif
#include "context.h"
#if FEATURE_convolution
#if FEATURE_convolve
#include "convolve.h"
#endif
#include "depth.h"
@ -402,7 +402,7 @@ _mesa_init_exec_table(struct _glapi_table *exec)
SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv);
#endif
#if FEATURE_convolution
#if FEATURE_convolve
SET_ConvolutionFilter1D(exec, _mesa_ConvolutionFilter1D);
SET_ConvolutionFilter2D(exec, _mesa_ConvolutionFilter2D);
SET_ConvolutionParameterf(exec, _mesa_ConvolutionParameterf);

2
src/mesa/main/mfeatures.h
View file

@ -39,7 +39,7 @@
#define FEATURE_accum _HAVE_FULL_GL
#define FEATURE_attrib_stack _HAVE_FULL_GL
#define FEATURE_colortable _HAVE_FULL_GL
#define FEATURE_convolution _HAVE_FULL_GL
#define FEATURE_convolve _HAVE_FULL_GL
#define FEATURE_dispatch _HAVE_FULL_GL
#define FEATURE_dlist _HAVE_FULL_GL
#define FEATURE_draw_read_buffer _HAVE_FULL_GL

4
src/mesa/state_tracker/st_cb_texture.c
View file

@ -26,7 +26,7 @@
**************************************************************************/
#include "main/imports.h"
#if FEATURE_convolution
#if FEATURE_convolve
#include "main/convolve.h"
#endif
#include "main/enums.h"
@ -409,7 +409,7 @@ st_TexImage(GLcontext * ctx,
stImage->face = _mesa_tex_target_to_face(target);
stImage->level = level;
#if FEATURE_convolution
#if FEATURE_convolve
if (ctx->_ImageTransferState & IMAGE_CONVOLUTION_BIT) {
_mesa_adjust_image_for_convolution(ctx, dims, &postConvWidth,
&postConvHeight);