diff options
author | Marek Olšák <marek.olsak@amd.com> | 2015-09-27 21:28:22 +0200 |
---|---|---|
committer | Marek Olšák <marek.olsak@amd.com> | 2015-10-03 22:06:08 +0200 |
commit | 4b8bb2f559b75c953e87c7b6bda17b155a87df15 (patch) | |
tree | befb961ff2ce47475179397a1f7db0e7ba32e298 | |
parent | 72a5dff9cbc9ec9edee9e9ef539e4cb3f9051903 (diff) | |
download | external_mesa3d-4b8bb2f559b75c953e87c7b6bda17b155a87df15.zip external_mesa3d-4b8bb2f559b75c953e87c7b6bda17b155a87df15.tar.gz external_mesa3d-4b8bb2f559b75c953e87c7b6bda17b155a87df15.tar.bz2 |
mesa: remove Driver.SaveFlushVertices
Nothing overrides it.
Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 1 | ||||
-rw-r--r-- | src/mesa/main/dd.h | 4 | ||||
-rw-r--r-- | src/mesa/main/dlist.c | 5 | ||||
-rw-r--r-- | src/mesa/vbo/vbo.h | 1 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save.c | 1 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save.h | 1 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 2 |
7 files changed, 5 insertions, 10 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index f34f7ff..571c631 100644 --- 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 6918383..2ae2eec 100644 --- 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 5554738..944be25 100644 --- 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 57ab2ac..c1f9236 100644 --- 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 a177660..7de1966 100644 --- 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 5b1ac81..465c314 100644 --- 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 29de3d3..36cc117 100644 --- 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 |