summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-09-27 21:28:22 +0200
committerMarek Olšák <marek.olsak@amd.com>2015-10-03 22:06:09 +0200
commit00f6beed02d644189b935b3cc9d70a6f993c034e (patch)
tree5b84aa39f40dbeaf922ba6406f05abb70a6f8feb
parentef6c0714af57d1aeaa9904fc4bb074e381ef928b (diff)
mesa: remove Driver.EndCallList
Nothing overrides it. Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mesa/drivers/common/driverfuncs.c3
-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.c8
-rw-r--r--src/mesa/vbo/vbo_save.h2
6 files changed, 2 insertions, 22 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 8da35b4aac7..3d1fccb3ab4 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 76def4c398c..0b04c8db23d 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -798,13 +798,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 af634a49080..e8059c7b260 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 07da3663b05..00e843c9a0f 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 07022b95789..79603e9b32e 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 699203ce8d6..8032db8a9e0 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 );