diff options
author | Oliver McFadden <[email protected]> | 2012-09-11 09:10:34 +0300 |
---|---|---|
committer | Oliver McFadden <[email protected]> | 2012-09-15 12:56:42 +0300 |
commit | 09df07373bfd209e8e7129272c4c257e050bb961 (patch) | |
tree | 31c2d0f01991aa7553e801f7916ce4db21dbe9a9 /src/mesa/vbo | |
parent | dce86022514268bd2be1e6f99657e5aa2897e20d (diff) |
mesa: remove FEATURE_dlist define.
Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
-rw-r--r-- | src/mesa/vbo/vbo_context.h | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save.c | 6 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save.h | 16 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 6 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_draw.c | 6 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_loopback.c | 6 |
6 files changed, 0 insertions, 42 deletions
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index 1c49de0ca2f..e3e37e7f282 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -78,9 +78,7 @@ struct vbo_context { GLuint map_vp_arb[VERT_ATTRIB_MAX]; struct vbo_exec_context exec; -#if FEATURE_dlist struct vbo_save_context save; -#endif /* Callback into the driver. This must always succeed, the driver * is responsible for initiating any fallback actions required: diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c index a400399273e..ad11b5ddcc5 100644 --- a/src/mesa/vbo/vbo_save.c +++ b/src/mesa/vbo/vbo_save.c @@ -34,9 +34,6 @@ #include "vbo_context.h" -#if FEATURE_dlist - - static void vbo_save_callback_init( struct gl_context *ctx ) { ctx->Driver.NewList = vbo_save_NewList; @@ -131,6 +128,3 @@ void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback ) else save->replay_flags &= ~VBO_SAVE_FALLBACK; } - - -#endif /* FEATURE_dlist */ diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 0b4d563a70e..f33669670c4 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -158,8 +158,6 @@ struct vbo_save_context { GLubyte *currentsz[VBO_ATTRIB_MAX]; }; -#if FEATURE_dlist - void vbo_save_init( struct gl_context *ctx ); void vbo_save_destroy( struct gl_context *ctx ); void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback ); @@ -195,18 +193,4 @@ void vbo_save_unmap_vertex_store(struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store); -#else /* FEATURE_dlist */ - -static inline void -vbo_save_init( struct gl_context *ctx ) -{ -} - -static inline void -vbo_save_destroy( struct gl_context *ctx ) -{ -} - -#endif /* FEATURE_dlist */ - #endif /* VBO_SAVE_H */ diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index f7936610c1c..89f09a8d83c 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -84,9 +84,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "vbo_noop.h" -#if FEATURE_dlist - - #ifdef ERROR #undef ERROR #endif @@ -1668,6 +1665,3 @@ vbo_save_api_init(struct vbo_save_context *save) ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _save_OBE_MultiDrawElementsBaseVertex; _mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt); } - - -#endif /* FEATURE_dlist */ diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index c6425ab1b79..8ffc96aec87 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -39,9 +39,6 @@ #include "vbo_context.h" -#if FEATURE_dlist - - /** * After playback, copy everything but the position from the * last vertex to the saved state @@ -331,6 +328,3 @@ end: save->buffer_ptr = vbo_save_map_vertex_store(ctx, save->vertex_store); } } - - -#endif /* FEATURE_dlist */ diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index 51e598e7e61..98772be7602 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -37,9 +37,6 @@ #include "vbo_context.h" -#if FEATURE_dlist - - typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * ); @@ -191,6 +188,3 @@ void vbo_loopback_vertex_list( struct gl_context *ctx, } } } - - -#endif /* FEATURE_dlist */ |