diff options
| -rw-r--r-- | src/mesa/main/arrayobj.c | 37 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 |
2 files changed, 27 insertions, 13 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 33c6a459539..42214d8d6a0 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -100,20 +100,28 @@ _mesa_lookup_vao_err(struct gl_context *ctx, GLuint id, const char *caller) return ctx->Array.DefaultVAO; } else { - struct gl_vertex_array_object *vao = - (struct gl_vertex_array_object *) - _mesa_HashLookup(ctx->Array.Objects, id); + struct gl_vertex_array_object *vao; - /* The ARB_direct_state_access specification says: - * - * "An INVALID_OPERATION error is generated if <vaobj> is not - * [compatibility profile: zero or] the name of an existing - * vertex array object." - */ - if (!vao || !vao->EverBound) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(non-existent vaobj=%u)", caller, id); - return NULL; + if (ctx->Array.LastLookedUpVAO && + ctx->Array.LastLookedUpVAO->Name == id) { + vao = ctx->Array.LastLookedUpVAO; + } else { + vao = (struct gl_vertex_array_object *) + _mesa_HashLookup(ctx->Array.Objects, id); + + /* The ARB_direct_state_access specification says: + * + * "An INVALID_OPERATION error is generated if <vaobj> is not + * [compatibility profile: zero or] the name of an existing + * vertex array object." + */ + if (!vao || !vao->EverBound) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(non-existent vaobj=%u)", caller, id); + return NULL; + } + + _mesa_reference_vao(ctx, &ctx->Array.LastLookedUpVAO, vao); } return vao; @@ -517,6 +525,9 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids) /* 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); + /* Unreference the array object. * If refcount hits zero, the object will be deleted. */ diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index dddbba5a44d..737f0be6d62 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1674,6 +1674,9 @@ struct gl_array_attrib /** The default vertex array object */ struct gl_vertex_array_object *DefaultVAO; + /** The last VAO accessed by a DSA function */ + struct gl_vertex_array_object *LastLookedUpVAO; + /** Array objects (GL_ARB/APPLE_vertex_array_object) */ struct _mesa_HashTable *Objects; |