Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com> --- src/mesa/main/attrib.c | 4 ++-- src/mesa/main/attrib.h | 6 +++--- src/mesa/main/mfeatures.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 806cf09..de518da 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -178,7 +178,7 @@ struct texture_state }; -#if FEATURE_attrib_stack +#if FEATURE_GL /** @@ -1609,7 +1609,7 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp) } -#endif /* FEATURE_attrib_stack */ +#endif /* FEATURE_GL */ /** diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h index 6809311..245d830 100644 --- a/src/mesa/main/attrib.h +++ b/src/mesa/main/attrib.h @@ -33,7 +33,7 @@ struct _glapi_table; struct gl_context; -#if FEATURE_attrib_stack +#if FEATURE_GL extern void GLAPIENTRY _mesa_PushAttrib( GLbitfield mask ); @@ -50,7 +50,7 @@ _mesa_PopClientAttrib( void ); extern void _mesa_init_attrib_dispatch(struct _glapi_table *disp); -#else /* FEATURE_attrib_stack */ +#else /* FEATURE_GL */ static inline void _mesa_PushClientAttrib( GLbitfield mask ) @@ -69,7 +69,7 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp) { } -#endif /* FEATURE_attrib_stack */ +#endif /* FEATURE_GL */ extern void _mesa_init_attrib( struct gl_context *ctx ); diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index bf0eb7d..62bb97b 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -84,7 +84,6 @@ #define FEATURE_remap_table 0 #endif -#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 -- 1.7.8.6 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev