diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/arrayobj.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 17a789f4da4..ce0050ace33 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -493,19 +493,18 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids) for (i = 0; i < n; i++) { struct gl_vertex_array_object *obj = _mesa_lookup_vao(ctx, ids[i]); - if ( obj != NULL ) { - assert( obj->Name == ids[i] ); - - /* If the array object is currently bound, the spec says "the binding - * for that object reverts to zero and the default vertex array - * becomes current." - */ - if ( obj == ctx->Array.VAO ) { - _mesa_BindVertexArray(0); - } - - /* The ID is immediately freed for re-use */ - remove_array_object(ctx, obj); + if (obj) { + assert(obj->Name == ids[i]); + + /* If the array object is currently bound, the spec says "the binding + * for that object reverts to zero and the default vertex array + * becomes current." + */ + if (obj == ctx->Array.VAO) + _mesa_BindVertexArray(0); + + /* The ID is immediately freed for re-use */ + remove_array_object(ctx, obj); if (ctx->Array.LastLookedUpVAO == obj) _mesa_reference_vao(ctx, &ctx->Array.LastLookedUpVAO, NULL); |