mesa: remove Driver.NotifySaveBegin

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 571c631a7dac6fb326732d3bb9b3d9eb8602d5c1..1d6246a8281fcbfc5caeb26acd30342217fe62e8 100644 (file)
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -187,7 +187,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->SaveNeedFlush = 0;
 
    driver->ProgramStringNotify = _tnl_program_string;
-   driver->NotifySaveBegin = NULL;
    driver->LightingSpaceChange = NULL;
 
    /* display list */

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 2ae2eecf5dcd97aa705c08b7ddef99b7f8a12ec0..43dee9ae7d625fd999fabf03e331258757117b34 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -792,13 +792,6 @@ struct dd_function_table {
    /** Need to call vbo_save_SaveFlushVertices() upon state change? */
    GLboolean SaveNeedFlush;
 
-   /**
-    * Give the driver the opportunity to hook in its own vtxfmt for
-    * compiling optimized display lists.  This is called on each valid
-    * glBegin() during list compilation.
-    */
-   GLboolean (*NotifySaveBegin)( struct gl_context *ctx, GLenum mode );
-
    /**
     * Notify driver that the special derived value _NeedEyeCoords has
     * changed.

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 944be2505b4ba8517be3564006a1cd27cf3b2af4..f63efa1acc132228626b26540d36bc6991b43b07 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5465,7 +5465,7 @@ save_Begin(GLenum mode)
       /* Give the driver an opportunity to hook in an optimized
        * display list compiler.
        */
-      if (ctx->Driver.NotifySaveBegin(ctx, mode))
+      if (vbo_save_NotifyBegin(ctx, mode))
          return;
 
       SAVE_FLUSH_VERTICES(ctx);

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index c1f92368a275e43455cd0b14c6029423687d53af..c316a09f9ec558d2fe1f2ca89500babf8c51a2fb 100644 (file)
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -90,7 +90,7 @@ vbo_initialize_save_dispatch(const struct gl_context *ctx,
 
 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);
 
 
 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 7de1966f9c94b1d43a3b9e10af1cc58d9eb56b19..bee6634cfec4fc80bf441671e288d77e072c9ac6 100644 (file)
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -39,7 +39,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;
-   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;
 }
 
 

diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index 465c314a930c18fe393ab86bc291f2825d5710f4..ccfe5700978d9983aad2e043a5839096ef563d2e 100644 (file)
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -179,7 +179,6 @@ void vbo_save_EndList( struct gl_context *ctx );
 void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode );
 void vbo_save_EndCallList( struct gl_context *ctx );
 void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *list );
-GLboolean vbo_save_NotifyBegin( struct gl_context *ctx, GLenum mode );
 
 void vbo_save_playback_vertex_list( struct gl_context *ctx, void *data );
 

diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 36cc11760f1a9352d3b06c06524337c39f4d4674..1a70d168c5591fba27ad124d4cc348af0892002a 100644 (file)
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -970,8 +970,7 @@ _save_CallLists(GLsizei n, GLenum type, const GLvoid * v)
 
 
 /**
- * Called via ctx->Driver.NotifySaveBegin() when a glBegin is getting
- * compiled into a display list.
+ * Called when a glBegin is getting compiled into a display list.
  * Updating of ctx->Driver.CurrentSavePrimitive is already taken care of.
  */
 GLboolean
@@ -1604,8 +1603,6 @@ vbo_save_api_init(struct vbo_save_context *save)
                                vbo_destroy_vertex_list,
                                vbo_print_vertex_list);
 
-   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;
-
    _save_vtxfmt_init(ctx);
    _save_current_init(ctx);
    _mesa_noop_vtxfmt_init(&save->vtxfmt_noop);