Reviewed-by: Erik Faye-Lund <[email protected]>
On Fri, Jul 7, 2017 at 4:11 PM, Brian Paul <[email protected]> wrote: > This function always returned GL_TRUE. Just make it a void function. > Remove unreachable code following the call to vbo_save_NotifyBegin() > in save_Begin() in dlist.c > > There were some stale comments that no longer applied since an earlier > code refactoring. > > No Piglit regressions. > --- > src/mesa/main/dlist.c | 18 +----------------- > src/mesa/vbo/vbo.h | 2 +- > src/mesa/vbo/vbo_save_api.c | 7 +------ > 3 files changed, 3 insertions(+), 24 deletions(-) > > diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c > index 7e44054..9e817be 100644 > --- a/src/mesa/main/dlist.c > +++ b/src/mesa/main/dlist.c > @@ -5766,25 +5766,9 @@ save_Begin(GLenum mode) > _mesa_compile_error(ctx, GL_INVALID_OPERATION, "recursive glBegin"); > } > else { > - Node *n; > - > ctx->Driver.CurrentSavePrimitive = mode; > > - /* Give the driver an opportunity to hook in an optimized > - * display list compiler. > - */ > - if (vbo_save_NotifyBegin(ctx, mode)) > - return; > - > - SAVE_FLUSH_VERTICES(ctx); > - n = alloc_instruction(ctx, OPCODE_BEGIN, 1); > - if (n) { > - n[1].e = mode; > - } > - > - if (ctx->ExecuteFlag) { > - CALL_Begin(ctx->Exec, (mode)); > - } > + vbo_save_NotifyBegin(ctx, mode); > } > } > > diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h > index eec484b..c8e87d3 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); > +void 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); > diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c > index a0735f6..a42a3c3 100644 > --- a/src/mesa/vbo/vbo_save_api.c > +++ b/src/mesa/vbo/vbo_save_api.c > @@ -1035,7 +1035,7 @@ _save_CallLists(GLsizei n, GLenum type, const GLvoid * > v) > * Called when a glBegin is getting compiled into a display list. > * Updating of ctx->Driver.CurrentSavePrimitive is already taken care of. > */ > -GLboolean > +void > vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode) > { > struct vbo_save_context *save = &vbo_context(ctx)->save; > @@ -1064,11 +1064,6 @@ vbo_save_NotifyBegin(struct gl_context *ctx, GLenum > mode) > > /* 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 > - * opcode into the display list. > - */ > - return GL_TRUE; > } > > > -- > 1.9.1 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
