<div dir="ltr">Reviewed-by: Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Mar 19, 2015 at 5:06 PM, Fredrik Höglund <<a href="mailto:fredrik@kde.org" target="_blank">fredrik@kde.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Generate GL_INVALID_OPERATION and return NULL when the buffer object hasn't been created. All callers expect this. v2: Use a more concise error message. Cc: Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>> --- src/mesa/main/bufferobj.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 78d3d78..9658770 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1003,8 +1003,8 @@ _mesa_lookup_bufferobj_locked(struct gl_context *ctx, GLuint 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. + * GL_INVALID_OPERATION if buffer is not the name of an existing + * buffer object. */ struct gl_buffer_object * _mesa_lookup_bufferobj_err(struct gl_context *ctx, GLuint buffer, @@ -1013,9 +1013,11 @@ _mesa_lookup_bufferobj_err(struct gl_context *ctx, GLuint buffer, struct gl_buffer_object *bufObj; bufObj = _mesa_lookup_bufferobj(ctx, buffer); - if (!bufObj) + if (!bufObj || bufObj == &DummyBufferObject) { _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(non-generated buffer name %u)", caller, buffer); + "%s(non-existent buffer object %u)", caller, buffer); <div class="HOEnZb"><div class="h5">+ return NULL; + } return bufObj; } -- 2.1.4 </div></div></blockquote></div> </div>