diff options
| -rw-r--r-- | src/mesa/main/api_arrayelt.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/api_arrayelt.h | 30 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 3 |
3 files changed, 1 insertions, 38 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 152340b5fde..d530001bc5e 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -83,9 +83,6 @@ typedef struct { #define NUM_TYPES 8 -#if FEATURE_arrayelt - - static const int ColorFuncs[2][NUM_TYPES] = { { _gloffset_Color3bv, @@ -1711,6 +1708,3 @@ void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp, { SET_ArrayElement(disp, vfmt->ArrayElement); } - - -#endif /* FEATURE_arrayelt */ diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h index 03810c69b5e..9887032597c 100644 --- a/src/mesa/main/api_arrayelt.h +++ b/src/mesa/main/api_arrayelt.h @@ -31,8 +31,6 @@ #include "main/mfeatures.h" #include "main/mtypes.h" -#if FEATURE_arrayelt - #define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) \ do { \ (vfmt)->ArrayElement = impl ## ArrayElement; \ @@ -52,33 +50,5 @@ extern void _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -#else /* FEATURE_arrayelt */ - -#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0) - -static inline GLboolean -_ae_create_context( struct gl_context *ctx ) -{ - return GL_TRUE; -} - -static inline void -_ae_destroy_context( struct gl_context *ctx ) -{ -} - -static inline void -_ae_invalidate_state( struct gl_context *ctx, GLuint new_state ) -{ -} - -static inline void -_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt) -{ -} - -#endif /* FEATURE_arrayelt */ - #endif /* API_ARRAYELT_H */ diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 4e608f489e2..bf0eb7da775 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 |