diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 1 | ||||
-rw-r--r-- | src/mesa/main/dd.h | 7 | ||||
-rw-r--r-- | src/mesa/main/dlist.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo.h | 1 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save.c | 1 | ||||
-rw-r--r-- | 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 1d6246a8281..cf43b155ddb 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->NewList = NULL; driver->EndList = NULL; driver->BeginCallList = NULL; driver->EndCallList = NULL; diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 43dee9ae7d6..244aa9d9865 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -799,13 +799,6 @@ struct dd_function_table { void (*LightingSpaceChange)( struct gl_context *ctx ); /** - * Called by glNewList(). - * - * Let the T&L component know what is going on with display lists - * in time to make changes to dispatch tables, etc. - */ - void (*NewList)( struct gl_context *ctx, GLuint list, GLenum mode ); - /** * Called by glEndList(). * * \sa dd_function_table::NewList. diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index f63efa1acc1..d3a329f8292 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -9028,7 +9028,7 @@ _mesa_NewList(GLuint name, GLenum mode) ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->Head; ctx->ListState.CurrentPos = 0; - ctx->Driver.NewList(ctx, name, mode); + vbo_save_NewList(ctx, name, mode); ctx->CurrentDispatch = ctx->Save; _glapi_set_dispatch(ctx->CurrentDispatch); diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index c316a09f9ec..e6eba47901c 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -91,6 +91,7 @@ vbo_initialize_save_dispatch(const struct gl_context *ctx, 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); 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 bee6634cfec..26df1edc59e 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.NewList = vbo_save_NewList; 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 ccfe5700978..65034ee5ef1 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -176,7 +176,6 @@ void vbo_loopback_vertex_list( struct gl_context *ctx, /* Callbacks: */ void vbo_save_EndList( struct gl_context *ctx ); -void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode ); void vbo_save_EndCallList( struct gl_context *ctx ); void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *list ); |