mesa: remove Driver.BeginCallList

Nothing overrides it.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 1a823048d1d553495c1056e8c5a8fcf5dd5c5685..8da35b4aac7bb1f3ef8388af9a8cef0b36b857f1 100644 (file)
--- 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 6e30484b1eb13bb4cd9076158ff4e7db9adba0ee..76def4c398c3ae9916be1e95c09e049ed4c24f0f 100644 (file)
--- 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 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().
     *

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 804583d0dea8f9128f6c8358d02f2d3d8bfc952e..af634a49080170a964a539e29c1ef82196603b8d 100644 (file)
--- 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 c4768bb1d3335e1f0f8b4a7a1c5a25c74235354d..07da3663b05a54e40b6a51a80b91906888f21a1f 100644 (file)
--- 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 4a786967d391e457bc014ba18c0ca59229baa5c1..07022b9578911eac10d5724267278c803c1d2877 100644 (file)
--- 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 2cd969486f529e1cecf30731e141a18794261038..699203ce8d6d1918ede376063f26bed41b84ebe5 100644 (file)
--- 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 );