From: Marek Olšák <marek.ol...@amd.com> Nothing overrides it. --- src/mesa/drivers/common/driverfuncs.c | 3 --- src/mesa/main/dd.h | 7 ------- src/mesa/main/dlist.c | 3 +-- src/mesa/vbo/vbo.h | 1 + src/mesa/vbo/vbo_save.c | 8 -------- src/mesa/vbo/vbo_save.h | 2 -- 6 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 8da35b4..3d1fccb 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -189,9 +189,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->ProgramStringNotify = _tnl_program_string; driver->LightingSpaceChange = NULL; - /* display list */ - driver->EndCallList = NULL; - /* GL_ARB_texture_storage */ driver->AllocTextureStorage = _mesa_AllocTextureStorage_sw; diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 577f6b3..14066dd 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -796,13 +796,6 @@ struct dd_function_table { */ void (*LightingSpaceChange)( struct gl_context *ctx ); - /** - * Called by glEndCallList(). - * - * \sa dd_function_table::BeginCallList. - */ - void (*EndCallList)( struct gl_context *ctx ); - /**@}*/ /** diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index af634a4..e8059c7 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -8898,8 +8898,7 @@ execute_list(struct gl_context *ctx, GLuint list) } } - if (ctx->Driver.EndCallList) - ctx->Driver.EndCallList(ctx); + vbo_save_EndCallList(ctx); ctx->ListState.CallDepth--; } diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index 07da366..00e843c 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -94,6 +94,7 @@ GLboolean vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode); void vbo_save_NewList(struct gl_context *ctx, GLuint list, GLenum mode); void vbo_save_EndList(struct gl_context *ctx); void vbo_save_BeginCallList(struct gl_context *ctx, struct gl_display_list *list); +void vbo_save_EndCallList(struct gl_context *ctx); typedef void (*vbo_draw_func)( struct gl_context *ctx, diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c index 07022b9..79603e9 100644 --- a/src/mesa/vbo/vbo_save.c +++ b/src/mesa/vbo/vbo_save.c @@ -33,13 +33,6 @@ #include "vbo_context.h" -static void vbo_save_callback_init( struct gl_context *ctx ) -{ - ctx->Driver.EndCallList = vbo_save_EndCallList; -} - - - /** * Called at context creation time. */ @@ -51,7 +44,6 @@ void vbo_save_init( struct gl_context *ctx ) save->ctx = ctx; vbo_save_api_init( save ); - vbo_save_callback_init(ctx); { struct gl_client_array *arrays = save->arrays; diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 699203c..8032db8 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -175,8 +175,6 @@ void vbo_loopback_vertex_list( struct gl_context *ctx, /* Callbacks: */ -void vbo_save_EndCallList( struct gl_context *ctx ); - void vbo_save_playback_vertex_list( struct gl_context *ctx, void *data ); void vbo_save_api_init( struct vbo_save_context *save ); -- 2.1.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev