[Mesa-dev] [PATCH 20/23] mesa: remove Driver.BeginCallList

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

Nothing overrides it.
---
 src/mesa/drivers/common/driverfuncs.c | 1 -
 src/mesa/main/dd.h                    | 7 -------
 src/mesa/main/dlist.c                 | 3 +--
 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(+), 12 deletions(-)

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 1a82304..8da35b4 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 b34391c..577f6b3 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 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 804583d..af634a4 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 c4768bb..07da366 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 4a78696..07022b9 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 2cd9694..699203c 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 );
 
-- 
2.1.4