aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2012-09-11 09:05:06 +0300
committerOliver McFadden <[email protected]>2012-09-15 12:56:33 +0300
commit985b0cb22fc5e88e7f572c7ead86f15a21abaee0 (patch)
tree617cdb39af61d537ed5af71dc5f9d7e6ea6f8b2e /src/mesa/main
parentd6543599da925fcb6ae3b40cbe673d06a824d717 (diff)
mesa: remove FEATURE_attrib_stack define.
Signed-off-by: Oliver McFadden <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/attrib.c6
-rw-r--r--src/mesa/main/attrib.h23
-rw-r--r--src/mesa/main/mfeatures.h1
3 files changed, 0 insertions, 30 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 806cf09d8b6..b92c4652eac 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 6809311cfdb..f75c3c5ced5 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 bf0eb7da775..62bb97b4fee 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