diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-01 21:30:50 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-09 11:52:05 +0000 |
| commit | 05ac187f305bb653d569b5c07446ec0f4cd7ff08 (patch) | |
| tree | ff87c0cfe76e67e55496563dbfbb5f4cb576dc81 /src/mesa/main/shared.c | |
| parent | 1c39dbb90cefad8a5a97e75042466d66ea4270bc (diff) | |
mesa: Fix null buffer object reference counting.
Always use _mesa_reference_buffer_object, and never call
ctx->Driver.DeleteBuffer() directly to prevent dangling pointers to the
null buffer object.
This fixes crash/assertions in sharedtex_mt and Autodesk Mudbox.
Diffstat (limited to 'src/mesa/main/shared.c')
| -rw-r--r-- | src/mesa/main/shared.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index 6cf63f6421..a7cf623c47 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -93,12 +93,14 @@ _mesa_alloc_shared_state(GLcontext *ctx) shared->BufferObjects = _mesa_NewHashTable(); #endif - /* Allocate the default buffer object and set refcount so high that - * it never gets deleted. - * XXX with recent/improved refcounting this may not longer be needed. - */ + /* Allocate the default buffer object */ shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0); +#ifndef DEBUG + /* Set refcount so high that it never gets deleted. + * XXX with recent/improved refcounting this should be no longer be needed. + */ shared->NullBufferObj->RefCount = 1000 * 1000 * 1000; +#endif /* Create default texture objects */ for (i = 0; i < NUM_TEXTURE_TARGETS; i++) { @@ -202,7 +204,7 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData) ctx->Driver.UnmapBuffer(ctx, 0, bufObj); bufObj->Pointer = NULL; } - ctx->Driver.DeleteBuffer(ctx, bufObj); + _mesa_reference_buffer_object(ctx, &bufObj, NULL); } @@ -335,7 +337,7 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared) #endif #if FEATURE_ARB_vertex_buffer_object - ctx->Driver.DeleteBuffer(ctx, shared->NullBufferObj); + _mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL); #endif #if FEATURE_ARB_sync |