diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-10-06 17:10:22 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-10-06 17:10:22 -0600 |
| commit | 4f4147eadd983bd4052c5a8e80a1750a813a25fc (patch) | |
| tree | e12b40fe8886921e854da4c3998a054f81ed57e0 /src/mesa | |
| parent | f8baad2d255c77c47dddeddcaf719e163e9556fb (diff) | |
mesa: fix convolve/convolution mix-ups
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/api_exec.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 0c3c9c4de4..bae3bf11cb 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 ed78f57edf..3819da3d68 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 |