mesa: remove FEATURE_beginend define.

Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>

5 files changed, 1 insertions, 41 deletions

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index c438307d84c..a5fbe8ebfeb 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -86,9 +86,6 @@
 #define ATTRIBI_4UI(index,x,y,z,w)   CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w))
 
 
-#if FEATURE_beginend
-
-
 static void GLAPIENTRY
 loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
 {
@@ -1720,6 +1717,3 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest )
    SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv);
    SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv);
 }
-
-
-#endif /* FEATURE_beginend */
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index f53b9028096..a99c30962b0 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -32,17 +32,6 @@
 
 struct _glapi_table;
 
-#if FEATURE_beginend
-
 extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
 
-#else /* FEATURE_beginend */
-
-static inline void
-_mesa_loopback_init_api_table( struct _glapi_table *dest )
-{
-}
-
-#endif /* FEATURE_beginend */
-
 #endif /* API_LOOPBACK_H */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 62bb97b4fee..cf652ad3d9c 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,11 +84,9 @@
 #define FEATURE_remap_table               0
 #endif
 
-/* 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_beginend)
+#define FEATURE_dlist                     FEATURE_GL
 #define FEATURE_draw_read_buffer          FEATURE_GL
 #define FEATURE_drawpix                   FEATURE_GL
 #define FEATURE_evaluators                FEATURE_GL
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 2b6e25ecdf6..7ebf9ed76e6 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -38,8 +38,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_beginend
-
 /**
  * Use the per-vertex functions found in <vfmt> to initialize the given
  * API dispatch table.
@@ -235,6 +233,3 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt)
    if (_mesa_is_desktop_gl(ctx))
       install_vtxfmt( ctx, ctx->Save, vfmt );
 }
-
-
-#endif /* FEATURE_beginend */
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index aac656879bf..65a0e6c8e16 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -37,23 +37,7 @@
 #include "mfeatures.h"
 #include "mtypes.h"
 
-#if FEATURE_beginend
-
 extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
 extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
 
-#else /* FEATURE_beginend */
-
-static inline void
-_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
-{
-}
-
-static inline void
-_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
-{
-}
-
-#endif /* FEATURE_beginend */
-
 #endif /* _VTXFMT_H_ */