summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-09-27 21:28:22 +0200
committerMarek Olšák <[email protected]>2015-10-03 22:06:09 +0200
commit7a5493972881cb6beb2e172f4159b39809ab3295 (patch)
tree7e276c186870dfe9e5425464519d6c7a3f06de89
parent4b8bb2f559b75c953e87c7b6bda17b155a87df15 (diff)
mesa: remove Driver.NotifySaveBegin
Nothing overrides it. Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/drivers/common/driverfuncs.c1
-rw-r--r--src/mesa/main/dd.h7
-rw-r--r--src/mesa/main/dlist.c2
-rw-r--r--src/mesa/vbo/vbo.h2
-rw-r--r--src/mesa/vbo/vbo_save.c1
-rw-r--r--src/mesa/vbo/vbo_save.h1
-rw-r--r--src/mesa/vbo/vbo_save_api.c5
7 files changed, 3 insertions, 16 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 571c631a7da..1d6246a8281 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->NotifySaveBegin = NULL;
driver->LightingSpaceChange = NULL;
/* display list */
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 2ae2eecf5dc..43dee9ae7d6 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -793,13 +793,6 @@ struct dd_function_table {
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 944be2505b4..f63efa1acc1 100644
--- 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 c1f92368a27..c316a09f9ec 100644
--- 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 7de1966f9c9..bee6634cfec 100644
--- 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 465c314a930..ccfe5700978 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 );
-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 36cc11760f1..1a70d168c55 100644
--- 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);