diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2017-04-22 17:10:09 +1000 |
|---|---|---|
| committer | Timothy Arceri <tarceri@itsqueeze.com> | 2017-04-26 10:03:06 +1000 |
| commit | f38845b9cbc892e09086c6d1a0d97eb516f1de83 (patch) | |
| tree | 9eb6a74151a6c27140d6519eabae4d04402ebe23 | |
| parent | 7927d0378fc72ceff7d0ddcbe7c21756f0e1f4ea (diff) | |
mesa: inline bind_vertex_array() helper
The previous commit removed the only other user of this function.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
| -rw-r--r-- | src/mesa/main/arrayobj.c | 23 |
1 files 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 */ /* @@ -483,17 +483,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. * * \param n Number of array objects to delete. |