From f38845b9cbc892e09086c6d1a0d97eb516f1de83 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sat, 22 Apr 2017 17:10:09 +1000 Subject: [PATCH] mesa: inline bind_vertex_array() helper MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The previous commit removed the only other user of this function. Reviewed-by: Nicolai Hähnle --- src/mesa/main/arrayobj.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 10502015cf0..c52a07b3062 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -417,19 +417,19 @@ _mesa_all_buffers_are_unmapped(const struct gl_vertex_array_object *vao) /** - * Helper for _mesa_BindVertexArray(). - * \param genRequired specifies behavour when id was not generated with - * glGenVertexArrays(). + * ARB version of glBindVertexArray() */ -static void -bind_vertex_array(struct gl_context *ctx, GLuint id) +void GLAPIENTRY +_mesa_BindVertexArray( GLuint id ) { + GET_CURRENT_CONTEXT(ctx); + struct gl_vertex_array_object * const oldObj = ctx->Array.VAO; struct gl_vertex_array_object *newObj = NULL; assert(oldObj != NULL); - if ( oldObj->Name == id ) + if (oldObj->Name == id) return; /* rebinding the same array object- no change */ /* @@ -482,17 +482,6 @@ bind_vertex_array(struct gl_context *ctx, GLuint id) } -/** - * ARB version of glBindVertexArray() - */ -void GLAPIENTRY -_mesa_BindVertexArray( GLuint id ) -{ - GET_CURRENT_CONTEXT(ctx); - bind_vertex_array(ctx, id); -} - - /** * Delete a set of array objects. * -- 2.30.2