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/main | |
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/main')
-rw-r--r-- | src/mesa/main/context.c | 2 | ||||
-rw-r--r-- | src/mesa/main/dlist.c | 8 | ||||
-rw-r--r-- | src/mesa/main/dlist.h | 28 | ||||
-rw-r--r-- | src/mesa/main/mfeatures.h | 1 |
4 files changed, 0 insertions, 39 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index dbd79e929c9..f5e6d9c605c 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1006,7 +1006,6 @@ _mesa_initialize_context(struct gl_context *ctx, switch (ctx->API) { case API_OPENGL: -#if FEATURE_dlist ctx->Save = _mesa_create_save_table(); if (!ctx->Save) { _mesa_reference_shared_state(ctx, &ctx->Shared, NULL); @@ -1015,7 +1014,6 @@ _mesa_initialize_context(struct gl_context *ctx, } _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt ); -#endif case API_OPENGL_CORE: break; case API_OPENGLES: diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 40e69336478..e4c19908faf 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -553,9 +553,6 @@ union uint64_pair static GLuint InstSize[OPCODE_END_OF_LIST + 1]; -#if FEATURE_dlist - - void mesa_print_display_list(GLuint list); @@ -11076,9 +11073,6 @@ void _mesa_init_dlist_dispatch(struct _glapi_table *disp) } -#endif /* FEATURE_dlist */ - - /** * Initialize display list state for given context. */ @@ -11106,9 +11100,7 @@ _mesa_init_display_list(struct gl_context *ctx) /* Display List group */ ctx->List.ListBase = 0; -#if FEATURE_dlist _mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt); -#endif } diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index 89008431a88..992a089f188 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -37,8 +37,6 @@ #include "main/mtypes.h" -#if FEATURE_dlist - #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) \ do { \ (vfmt)->CallList = impl ## CallList; \ @@ -70,32 +68,6 @@ extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); -#else /* FEATURE_dlist */ - -#include "main/compiler.h" - -#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0) - -static inline void -_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist) -{ - /* there should be no list to delete */ - ASSERT_NO_FEATURE(); -} - -static inline void -_mesa_install_dlist_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt) -{ -} - -static inline void -_mesa_init_dlist_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_dlist */ - extern void _mesa_init_display_list( struct gl_context * ctx ); extern void _mesa_free_display_list_data(struct gl_context *ctx); diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 6094a02e980..bfd7e2783ae 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_dlist FEATURE_GL #define FEATURE_draw_read_buffer FEATURE_GL #define FEATURE_drawpix FEATURE_GL #define FEATURE_evaluators FEATURE_GL |