Mesa (gallium-0.1): mesa: fix convolve/convolution mix-ups
Brian Paul
brianp at kemper.freedesktop.org
Mon Oct 6 23:48:41 UTC 2008
Module: Mesa
Branch: gallium-0.1
Commit: d055b2c001a0fb233f98c10d124b43dd2448059e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d055b2c001a0fb233f98c10d124b43dd2448059e
Author: Brian <brian.paul at tungstengraphics.com>
Date: Mon Oct 6 17:10:45 2008 -0600
mesa: fix convolve/convolution mix-ups
---
src/mesa/main/api_exec.c | 4 ++--
src/mesa/main/mfeatures.h | 2 +-
src/mesa/state_tracker/st_cb_texture.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 0c3c9c4..bae3bf1 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -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);
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index b08c017..487493f 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -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
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 958f88b..a018cde 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -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);
More information about the mesa-commit
mailing list