summaryrefslogtreecommitdiffstats
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
commitf457964885afedaa47c1ee675c313650d1082473 (patch)
tree5a4537d80aff64cf39330dccdc52ec08af51b1ee
parent55735cad007f15fb407f803a0416593997a2045e (diff)
mesa: remove Driver.EndList
Nothing overrides it. Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/drivers/common/driverfuncs.c1
-rw-r--r--src/mesa/main/dd.h7
-rw-r--r--src/mesa/main/dlist.c2
-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, 11 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index cf43b155ddb..1a823048d1d 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 244aa9d9865..6e30484b1eb 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 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 d3a329f8292..804583d0dea 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 e6eba47901c..c4768bb1d33 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 26df1edc59e..4a786967d39 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 65034ee5ef1..2cd969486f5 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 );