Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com> --- src/mesa/main/api_arrayelt.c | 4 ++-- src/mesa/main/api_arrayelt.h | 6 +++--- src/mesa/main/mfeatures.h | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 152340b..08b9732 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -83,7 +83,7 @@ typedef struct { #define NUM_TYPES 8 -#if FEATURE_arrayelt +#if FEATURE_GL static const int ColorFuncs[2][NUM_TYPES] = { @@ -1713,4 +1713,4 @@ void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp, } -#endif /* FEATURE_arrayelt */ +#endif /* FEATURE_GL */ diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h index 03810c6..e665dae 100644 --- a/src/mesa/main/api_arrayelt.h +++ b/src/mesa/main/api_arrayelt.h @@ -31,7 +31,7 @@ #include "main/mfeatures.h" #include "main/mtypes.h" -#if FEATURE_arrayelt +#if FEATURE_GL #define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) \ do { \ @@ -52,7 +52,7 @@ extern void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -#else /* FEATURE_arrayelt */ +#else /* FEATURE_GL */ #define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0) @@ -78,7 +78,7 @@ _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp, { } -#endif /* FEATURE_arrayelt */ +#endif /* FEATURE_GL */ #endif /* API_ARRAYELT_H */ diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 4e608f4..bf0eb7d 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -84,13 +84,12 @@ #define FEATURE_remap_table 0 #endif -#define FEATURE_arrayelt FEATURE_GL #define FEATURE_attrib_stack FEATURE_GL /* this disables vtxfmt, api_loopback, and api_noop completely */ #define FEATURE_beginend FEATURE_GL #define FEATURE_colortable FEATURE_GL #define FEATURE_convolve FEATURE_GL -#define FEATURE_dlist (FEATURE_GL && FEATURE_arrayelt && FEATURE_beginend) +#define FEATURE_dlist (FEATURE_GL && FEATURE_beginend) #define FEATURE_draw_read_buffer FEATURE_GL #define FEATURE_drawpix FEATURE_GL #define FEATURE_evaluators FEATURE_GL -- 1.7.8.6 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev