From 768ca8b83e45b1d23c0d3af0b79cc19c1b3b6988 Mon Sep 17 00:00:00 2001 From: Laura Ekstrand Date: Fri, 9 Jan 2015 16:16:48 -0800 Subject: [PATCH] main: Add utility function _mesa_lookup_bufferobj_err. This function is exposed to mesa driver internals so that texture buffer objects and array objects can use it. Reviewed-by: Anuj Phogat --- src/mesa/main/bufferobj.c | 19 +++++++++++++++++++ src/mesa/main/bufferobj.h | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index e1c5877797a..cef284fb7ce 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1006,6 +1006,25 @@ _mesa_lookup_bufferobj_locked(struct gl_context *ctx, GLuint buffer) _mesa_HashLookupLocked(ctx->Shared->BufferObjects, buffer); } +/** + * A convenience function for direct state access functions that throws + * GL_INVALID_OPERATION if buffer is not the name of a buffer object in the + * hash table. + */ +struct gl_buffer_object * +_mesa_lookup_bufferobj_err(struct gl_context *ctx, GLuint buffer, + const char *caller) +{ + struct gl_buffer_object *bufObj; + + bufObj = _mesa_lookup_bufferobj(ctx, buffer); + if (!bufObj) + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(non-generated buffer name %u)", caller, buffer); + + return bufObj; +} + void _mesa_begin_bufferobj_lookups(struct gl_context *ctx) diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index fe294fc0bed..8e53bfd979e 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -89,6 +89,10 @@ _mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer); extern struct gl_buffer_object * _mesa_lookup_bufferobj_locked(struct gl_context *ctx, GLuint buffer); +extern struct gl_buffer_object * +_mesa_lookup_bufferobj_err(struct gl_context *ctx, GLuint buffer, + const char *caller); + extern void _mesa_begin_bufferobj_lookups(struct gl_context *ctx); -- 2.30.2