mesa: remove Driver.SaveFlushVertices

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 f34f7ff144ed78215eb3c35740e070564fe2d46c..571c631a7dac6fb326732d3bb9b3d9eb8602d5c1 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->SaveFlushVertices = NULL;
    driver->NotifySaveBegin = NULL;
    driver->LightingSpaceChange = NULL;
 

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 69183836500f2ed111d70a1c7d4bf61dbb7159c9..2ae2eecf5dcd97aa705c08b7ddef99b7f8a12ec0 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -789,11 +789,9 @@ struct dd_function_table {
     */
    GLbitfield NeedFlush;
 
-   /** Need to call SaveFlushVertices() upon state change? */
+   /** Need to call vbo_save_SaveFlushVertices() upon state change? */
    GLboolean SaveNeedFlush;
 
-   void (*SaveFlushVertices)( struct gl_context *ctx );
-
    /**
     * Give the driver the opportunity to hook in its own vtxfmt for
     * compiling optimized display lists.  This is called on each valid

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 5554738d1a3154a26eee2a1540426fe19ab7eb0b..944be2505b4ba8517be3564006a1cd27cf3b2af4 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -105,13 +105,12 @@ struct gl_list_extensions
  * \param ctx GL context.
  *
  * Checks if dd_function_table::SaveNeedFlush is marked to flush
- * stored (save) vertices, and calls
- * dd_function_table::SaveFlushVertices if so.
+ * stored (save) vertices, and calls vbo_save_SaveFlushVertices if so.
  */
 #define SAVE_FLUSH_VERTICES(ctx)               \
 do {                                           \
    if (ctx->Driver.SaveNeedFlush)              \
-      ctx->Driver.SaveFlushVertices(ctx);      \
+      vbo_save_SaveFlushVertices(ctx);               \
 } while (0)
 
 

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 57ab2acc18aa6e75de97614310f5106d0bca8959..c1f92368a275e43455cd0b14c6029423687d53af 100644 (file)
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -89,6 +89,7 @@ vbo_initialize_save_dispatch(const struct gl_context *ctx,
                              struct _glapi_table *exec);
 
 void vbo_exec_FlushVertices(struct gl_context *ctx, GLuint flags);
+void vbo_save_SaveFlushVertices(struct gl_context *ctx);
 
 
 

diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
index a177660c0f2b9d0ce559146772fa38db424b1586..7de1966f9c94b1d43a3b9e10af1cc58d9eb56b19 100644 (file)
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -37,7 +37,6 @@ static void vbo_save_callback_init( struct gl_context *ctx )
 {
    ctx->Driver.NewList = vbo_save_NewList;
    ctx->Driver.EndList = vbo_save_EndList;
-   ctx->Driver.SaveFlushVertices = vbo_save_SaveFlushVertices;
    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 5b1ac81771ed1604ec694d3a90a26ef2839d8e78..465c314a930c18fe393ab86bc291f2825d5710f4 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 );
-void vbo_save_SaveFlushVertices( struct gl_context *ctx );
 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 29de3d38aaa33edeb381adbbff116627f7dca442..36cc11760f1a9352d3b06c06524337c39f4d4674 100644 (file)
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1001,7 +1001,7 @@ vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode)
       _mesa_install_save_vtxfmt(ctx, &save->vtxfmt);
    }
 
-   /* We need to call SaveFlushVertices() if there's state change */
+   /* We need to call vbo_save_SaveFlushVertices() if there's state change */
    ctx->Driver.SaveNeedFlush = GL_TRUE;
 
    /* GL_TRUE means we've handled this glBegin here; don't compile a BEGIN