{
(void) ctx; (void) target;
- if (bufObj->Data && ((GLuint) (size + offset) <= bufObj->Size)) {
+ if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {
_mesa_memcpy( data, (GLubyte *) bufObj->Data + offset, size );
}
}
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *oldBufObj;
- struct gl_buffer_object *newBufObj = 0;
+ struct gl_buffer_object *newBufObj = NULL;
ASSERT_OUTSIDE_BEGIN_END(ctx);
oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" );
assert(oldBufObj->RefCount >= 0);
if (oldBufObj->RefCount == 0) {
assert(oldBufObj->Name != 0);
- _mesa_remove_buffer_object(ctx, oldBufObj);
ASSERT(ctx->Driver.DeleteBuffer);
- (*ctx->Driver.DeleteBuffer)( ctx, oldBufObj );
+ ctx->Driver.DeleteBuffer( ctx, oldBufObj );
}
}
}
_mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
}
- /* decrement refcount and delete if <= 0 */
- if (!bufObj->DeletePending) {
- bufObj->DeletePending = GL_TRUE;
- bufObj->RefCount--;
- }
-
+ /* The ID is immediately freed for re-use */
+ _mesa_remove_buffer_object(ctx, bufObj);
+ bufObj->RefCount--;
if (bufObj->RefCount <= 0) {
- /* buffer should not be bound anymore! */
ASSERT(ctx->Array.ArrayBufferObj != bufObj);
ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);
ASSERT(ctx->Array.Vertex.BufferObj != bufObj);
- _mesa_remove_buffer_object(ctx, bufObj);
ASSERT(ctx->Driver.DeleteBuffer);
- (*ctx->Driver.DeleteBuffer)(ctx, bufObj);
+ ctx->Driver.DeleteBuffer(ctx, bufObj);
}
}
}
GLenum target = 0;
bufObj = (*ctx->Driver.NewBufferObject)( ctx, name, target );
if (!bufObj) {
+ _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenBuffersARB");
return;
}
bufObj = (struct gl_buffer_object *) _mesa_HashLookup(ctx->Shared->BufferObjects, id);
_glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
- return bufObj && !bufObj->DeletePending;
+ return bufObj ? GL_TRUE : GL_FALSE;
}