From: Marek Olšák <marek.ol...@amd.com> Nothing overrides it. --- src/mesa/drivers/common/driverfuncs.c | 1 - src/mesa/main/dd.h | 7 ------- src/mesa/main/dlist.c | 2 +- src/mesa/vbo/vbo.h | 1 + src/mesa/vbo/vbo_save.c | 1 - src/mesa/vbo/vbo_save.h | 1 - 6 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index cf43b15..1a82304 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -190,7 +190,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->LightingSpaceChange = NULL; /* display list */ - driver->EndList = NULL; driver->BeginCallList = NULL; driver->EndCallList = NULL; diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 53533c5..b34391c 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -797,13 +797,6 @@ struct dd_function_table { void (*LightingSpaceChange)( struct gl_context *ctx ); /** - * Called by glEndList(). - * - * \sa dd_function_table::NewList. - */ - void (*EndList)( struct gl_context *ctx ); - - /** * Called by glCallList(s). * * Notify the T&L component before and after calling a display list. diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index d3a329f..804583d 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -9062,7 +9062,7 @@ _mesa_EndList(void) /* Call before emitting END_OF_LIST, in case the driver wants to * emit opcodes itself. */ - ctx->Driver.EndList(ctx); + vbo_save_EndList(ctx); (void) alloc_instruction(ctx, OPCODE_END_OF_LIST, 0); diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index e6eba47..c4768bb 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -92,6 +92,7 @@ void vbo_exec_FlushVertices(struct gl_context *ctx, GLuint flags); void vbo_save_SaveFlushVertices(struct gl_context *ctx); 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); 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 26df1ed..4a78696 100644 --- a/src/mesa/vbo/vbo_save.c +++ b/src/mesa/vbo/vbo_save.c @@ -35,7 +35,6 @@ static void vbo_save_callback_init( struct gl_context *ctx ) { - ctx->Driver.EndList = vbo_save_EndList; ctx->Driver.BeginCallList = vbo_save_BeginCallList; ctx->Driver.EndCallList = vbo_save_EndCallList; } diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 65034ee..2cd9694 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -175,7 +175,6 @@ void vbo_loopback_vertex_list( struct gl_context *ctx, /* Callbacks: */ -void vbo_save_EndList( struct gl_context *ctx ); void vbo_save_EndCallList( struct gl_context *ctx ); void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *list ); -- 2.1.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev