[Mesa-dev] [PATCH 06/47] mesa: remove FEATURE_attrib_stack define.
Oliver McFadden
oliver.mcfadden at linux.intel.com
Thu Sep 13 01:18:35 PDT 2012
Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
src/mesa/main/attrib.c | 6 ------
src/mesa/main/attrib.h | 23 -----------------------
src/mesa/main/mfeatures.h | 1 -
3 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 806cf09..b92c465 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -178,9 +178,6 @@ struct texture_state
};
-#if FEATURE_attrib_stack
-
-
/**
* Allocate new attribute node of given type/kind. Attach payload data.
* Insert it into the linked list named by 'head'.
@@ -1609,9 +1606,6 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp)
}
-#endif /* FEATURE_attrib_stack */
-
-
/**
* Free any attribute state data that might be attached to the context.
*/
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 6809311..f75c3c5 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -33,8 +33,6 @@
struct _glapi_table;
struct gl_context;
-#if FEATURE_attrib_stack
-
extern void GLAPIENTRY
_mesa_PushAttrib( GLbitfield mask );
@@ -50,27 +48,6 @@ _mesa_PopClientAttrib( void );
extern void
_mesa_init_attrib_dispatch(struct _glapi_table *disp);
-#else /* FEATURE_attrib_stack */
-
-static inline void
-_mesa_PushClientAttrib( GLbitfield mask )
-{
- ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_PopClientAttrib( void )
-{
- ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_init_attrib_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_attrib_stack */
-
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
More information about the mesa-dev
mailing list