Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com> --- src/mesa/main/context.c | 2 +- src/mesa/main/dlist.c | 6 +++--- src/mesa/main/dlist.h | 6 +++--- src/mesa/main/mfeatures.h | 1 - src/mesa/vbo/vbo_context.h | 2 +- src/mesa/vbo/vbo_save.c | 4 ++-- src/mesa/vbo/vbo_save.h | 6 +++--- src/mesa/vbo/vbo_save_api.c | 4 ++-- src/mesa/vbo/vbo_save_draw.c | 4 ++-- src/mesa/vbo/vbo_save_loopback.c | 4 ++-- 10 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index dbd79e9..85fc3a3 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1006,7 +1006,7 @@ _mesa_initialize_context(struct gl_context *ctx, switch (ctx->API) { case API_OPENGL: -#if FEATURE_dlist +#if FEATURE_GL ctx->Save = _mesa_create_save_table(); if (!ctx->Save) { _mesa_reference_shared_state(ctx, &ctx->Shared, NULL); diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 40e6933..5103e46 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -553,7 +553,7 @@ union uint64_pair static GLuint InstSize[OPCODE_END_OF_LIST + 1]; -#if FEATURE_dlist +#if FEATURE_GL void mesa_print_display_list(GLuint list); @@ -11076,7 +11076,7 @@ void _mesa_init_dlist_dispatch(struct _glapi_table *disp) } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ /** @@ -11106,7 +11106,7 @@ _mesa_init_display_list(struct gl_context *ctx) /* Display List group */ ctx->List.ListBase = 0; -#if FEATURE_dlist +#if FEATURE_GL _mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt); #endif } diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index 8900843..e22ca3c 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -37,7 +37,7 @@ #include "main/mtypes.h" -#if FEATURE_dlist +#if FEATURE_GL #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) \ do { \ @@ -70,7 +70,7 @@ extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); -#else /* FEATURE_dlist */ +#else /* FEATURE_GL */ #include "main/compiler.h" @@ -94,7 +94,7 @@ _mesa_init_dlist_dispatch(struct _glapi_table *disp) { } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ extern void _mesa_init_display_list( struct gl_context * ctx ); diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 6094a02..bfd7e27 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 diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index 1c49de0..7b69498 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -78,7 +78,7 @@ struct vbo_context { GLuint map_vp_arb[VERT_ATTRIB_MAX]; struct vbo_exec_context exec; -#if FEATURE_dlist +#if FEATURE_GL struct vbo_save_context save; #endif diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c index a400399..74c672e 100644 --- a/src/mesa/vbo/vbo_save.c +++ b/src/mesa/vbo/vbo_save.c @@ -34,7 +34,7 @@ #include "vbo_context.h" -#if FEATURE_dlist +#if FEATURE_GL static void vbo_save_callback_init( struct gl_context *ctx ) @@ -133,4 +133,4 @@ void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback ) } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 0b4d563..a7155f9 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -158,7 +158,7 @@ struct vbo_save_context { GLubyte *currentsz[VBO_ATTRIB_MAX]; }; -#if FEATURE_dlist +#if FEATURE_GL void vbo_save_init( struct gl_context *ctx ); void vbo_save_destroy( struct gl_context *ctx ); @@ -195,7 +195,7 @@ void vbo_save_unmap_vertex_store(struct gl_context *ctx, struct vbo_save_vertex_store *vertex_store); -#else /* FEATURE_dlist */ +#else /* FEATURE_GL */ static inline void vbo_save_init( struct gl_context *ctx ) @@ -207,6 +207,6 @@ vbo_save_destroy( struct gl_context *ctx ) { } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ #endif /* VBO_SAVE_H */ diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index f793661..da96964 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -84,7 +84,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "vbo_noop.h" -#if FEATURE_dlist +#if FEATURE_GL #ifdef ERROR @@ -1670,4 +1670,4 @@ vbo_save_api_init(struct vbo_save_context *save) } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index c6425ab..cbd66d5 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -39,7 +39,7 @@ #include "vbo_context.h" -#if FEATURE_dlist +#if FEATURE_GL /** @@ -333,4 +333,4 @@ end: } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index 51e598e..f0addfc 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -37,7 +37,7 @@ #include "vbo_context.h" -#if FEATURE_dlist +#if FEATURE_GL typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * ); @@ -193,4 +193,4 @@ void vbo_loopback_vertex_list( struct gl_context *ctx, } -#endif /* FEATURE_dlist */ +#endif /* FEATURE_GL */ -- 1.7.8.6 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev