summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-09-27 21:28:22 +0200
committerMarek Olšák <[email protected]>2015-10-03 22:06:09 +0200
commitef6c0714af57d1aeaa9904fc4bb074e381ef928b (patch)
tree616be7794d107f9ebb9e243a0e7d1c33c9062718 /src/mesa
parentf457964885afedaa47c1ee675c313650d1082473 (diff)
mesa: remove Driver.BeginCallList
Nothing overrides it. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/common/driverfuncs.c1
-rw-r--r--src/mesa/main/dd.h7
-rw-r--r--src/mesa/main/dlist.c3
-rw-r--r--src/mesa/vbo/vbo.h1
-rw-r--r--src/mesa/vbo/vbo_save.c1
-rw-r--r--src/mesa/vbo/vbo_save.h1
6 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 1a823048d1d..8da35b4aac7 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->BeginCallList = NULL;
driver->EndCallList = NULL;
/* GL_ARB_texture_storage */
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 6e30484b1eb..76def4c398c 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 glCallList(s).
- *
- * Notify the T&L component before and after calling a display list.
- */
- void (*BeginCallList)( struct gl_context *ctx,
- struct gl_display_list *dlist );
- /**
* Called by glEndCallList().
*
* \sa dd_function_table::BeginCallList.
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 804583d0dea..af634a49080 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -7742,8 +7742,7 @@ execute_list(struct gl_context *ctx, GLuint list)
ctx->ListState.CallDepth++;
- if (ctx->Driver.BeginCallList)
- ctx->Driver.BeginCallList(ctx, dlist);
+ vbo_save_BeginCallList(ctx, dlist);
n = dlist->Head;
diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index c4768bb1d33..07da3663b05 100644
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -93,6 +93,7 @@ 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);
+void vbo_save_BeginCallList(struct gl_context *ctx, struct gl_display_list *list);
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 4a786967d39..07022b95789 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.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 2cd969486f5..699203ce8d6 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_EndCallList( struct gl_context *ctx );
-void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *list );
void vbo_save_playback_vertex_list( struct gl_context *ctx, void *data );