mesa: remove FEATURE_beginend define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index c438307d84cebe336ea31b9520a12958ac2cdc14..a5fbe8ebfeb54bc1a4b6ac3f996d2ac16a5afdbc 100644 (file)
--- 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 f53b90280966c15f310fdae913f1dc6e7aa09550..a99c30962b0bc2b1ea381297d5058a9cc15eb8e9 100644 (file)
--- 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 62bb97b4fee0c4ef3dbdc5012d21bb61a188ebdc..cf652ad3d9c57a8d86ed741386342460f91289ae 100644 (file)
--- 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 2b6e25ecdf67964e2c76a32e25433980785fb5df..7ebf9ed76e6cd82ab0e0d0d1d303273959966a75 100644 (file)
--- 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 aac656879bf873ad78eb583c8bc7e66592a78076..65a0e6c8e16788e13f677af905293bf4ebcf9662 100644 (file)
--- 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_ */

diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index 4ac7d168dc7d15b1a196435b2ccf302aa24956eb..635e743aec7f0d03ff5332304dabceefb914bc17 100644 (file)
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -160,24 +160,9 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec );
 void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );
 
 
-#if FEATURE_beginend
-
 void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );
 void vbo_exec_vtx_map( struct vbo_exec_context *exec );
 
-#else /* FEATURE_beginend */
-
-static inline void
-vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
-{
-}
-
-static inline void
-vbo_exec_vtx_map( struct vbo_exec_context *exec )
-{
-}
-
-#endif /* FEATURE_beginend */
 
 void vbo_exec_vtx_wrap( struct vbo_exec_context *exec );
 

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index ded711b9fcd2cb4a6253784eb1e09f0945735219..ccd5dfb26aeae9c0af65a9976358f817ec51aad6 100644 (file)
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -550,9 +550,6 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
 }
 
 
-#if FEATURE_beginend
-
-
 #if FEATURE_evaluators
 
 static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u )
@@ -1048,74 +1045,6 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
 }
 
 
-#else /* FEATURE_beginend */
-
-
-static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
-{
-   /* silence warnings */
-   (void) vbo_Color3f;
-   (void) vbo_Color3fv;
-   (void) vbo_Color4f;
-   (void) vbo_Color4fv;
-   (void) vbo_FogCoordfEXT;
-   (void) vbo_FogCoordfvEXT;
-   (void) vbo_MultiTexCoord1f;
-   (void) vbo_MultiTexCoord1fv;
-   (void) vbo_MultiTexCoord2f;
-   (void) vbo_MultiTexCoord2fv;
-   (void) vbo_MultiTexCoord3f;
-   (void) vbo_MultiTexCoord3fv;
-   (void) vbo_MultiTexCoord4f;
-   (void) vbo_MultiTexCoord4fv;
-   (void) vbo_Normal3f;
-   (void) vbo_Normal3fv;
-   (void) vbo_SecondaryColor3fEXT;
-   (void) vbo_SecondaryColor3fvEXT;
-   (void) vbo_TexCoord1f;
-   (void) vbo_TexCoord1fv;
-   (void) vbo_TexCoord2f;
-   (void) vbo_TexCoord2fv;
-   (void) vbo_TexCoord3f;
-   (void) vbo_TexCoord3fv;
-   (void) vbo_TexCoord4f;
-   (void) vbo_TexCoord4fv;
-   (void) vbo_Vertex2f;
-   (void) vbo_Vertex2fv;
-   (void) vbo_Vertex3f;
-   (void) vbo_Vertex3fv;
-   (void) vbo_Vertex4f;
-   (void) vbo_Vertex4fv;
-
-   (void) vbo_VertexAttrib1fARB;
-   (void) vbo_VertexAttrib1fvARB;
-   (void) vbo_VertexAttrib2fARB;
-   (void) vbo_VertexAttrib2fvARB;
-   (void) vbo_VertexAttrib3fARB;
-   (void) vbo_VertexAttrib3fvARB;
-   (void) vbo_VertexAttrib4fARB;
-   (void) vbo_VertexAttrib4fvARB;
-
-   (void) vbo_VertexAttrib1fNV;
-   (void) vbo_VertexAttrib1fvNV;
-   (void) vbo_VertexAttrib2fNV;
-   (void) vbo_VertexAttrib2fvNV;
-   (void) vbo_VertexAttrib3fNV;
-   (void) vbo_VertexAttrib3fvNV;
-   (void) vbo_VertexAttrib4fNV;
-   (void) vbo_VertexAttrib4fvNV;
-
-   (void) vbo_Materialfv;
-
-   (void) vbo_EdgeFlag;
-   (void) vbo_Indexf;
-   (void) vbo_Indexfv;
-}
-
-
-#endif /* FEATURE_beginend */
-
-
 /**
  * Tell the VBO module to use a real OpenGL vertex buffer object to
  * store accumulated immediate-mode vertex data.

diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 77db8ec7f3eb92161d4f84b0746cca1b709e631b..15ecfc03119205944fd95adc40a447f2a213dbbc 100644 (file)
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -38,9 +38,6 @@
 #include "vbo_noop.h"
 
 
-#if FEATURE_beginend
-
-
 static void
 vbo_exec_debug_verts( struct vbo_exec_context *exec )
 {
@@ -441,6 +438,3 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped)
    exec->vtx.prim_count = 0;
    exec->vtx.vert_count = 0;
 }
-
-
-#endif /* FEATURE_beginend */

diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index 2f472c21c2e49105a519ef939e0b4cc96decce36..86bdbb04edb1b06096d51e928e45501938aa91e2 100644 (file)
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -37,9 +37,6 @@
 #include "main/mfeatures.h"
 #include "vbo/vbo_noop.h"
 
-#if FEATURE_beginend
-
-
 static void GLAPIENTRY
 _mesa_noop_EdgeFlag(GLboolean b)
 {
@@ -514,6 +511,3 @@ _mesa_using_noop_vtxfmt(const struct _glapi_table *dispatch)
 {
    return GET_Begin((struct _glapi_table *) dispatch) == _mesa_noop_Begin;
 }
-
-
-#endif /* FEATURE_beginend */

diff --git a/src/mesa/vbo/vbo_noop.h b/src/mesa/vbo/vbo_noop.h
index 92f61d356e375de50a4e57080adf8332c9efdd90..044d373e85f2d00a71750e543a1cc56b5fae5a56 100644 (file)
--- a/src/mesa/vbo/vbo_noop.h
+++ b/src/mesa/vbo/vbo_noop.h
@@ -30,22 +30,11 @@
 #include "main/mtypes.h"
 
 
-#if FEATURE_beginend
-
 extern void
 _mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
 
 extern GLboolean
 _mesa_using_noop_vtxfmt(const struct _glapi_table *dispatch);
 
-#else
-
-static inline void
-_mesa_noop_vtxfmt_init(GLvertexformat *vfmt)
-{
-}
-
-#endif /* FEATURE_beginend */
-
 
 #endif /* _API_NOOP_H */