diff options
| author | Brian Paul <[email protected]> | 2009-06-15 10:58:04 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-06-15 10:58:04 -0600 |
| commit | 01f7bda44c92268fa288bbd8f53af3a3620bd315 (patch) | |
| tree | f6f2c3ee5509989ebe72ff7a9c2a17c086721584 /src/mesa/vbo/vbo_rebase.c | |
| parent | b0d874bfbec8a323d7a69d98fad875162222a1cb (diff) | |
mesa: revert some recent VBO buffer object refcounting changes
Reverts part of commit d7ea9ddf5824556e47decac7ba200f37cf1e552f.
We were calling _mesa_reference_buffer_object() on some heap-allocated
memory that was uninitialized and could trigger an assertion.
We can actually go back to "looser" ref counting of the Null/default
buffer object in these cases.
Diffstat (limited to 'src/mesa/vbo/vbo_rebase.c')
| -rw-r--r-- | src/mesa/vbo/vbo_rebase.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c index 2fcaba23641..ea87dede646 100644 --- a/src/mesa/vbo/vbo_rebase.c +++ b/src/mesa/vbo/vbo_rebase.c @@ -49,7 +49,6 @@ #include "main/glheader.h" #include "main/imports.h" #include "main/mtypes.h" -#include "main/bufferobj.h" #include "vbo.h" @@ -162,8 +161,7 @@ void vbo_rebase_prims( GLcontext *ctx, GL_ELEMENT_ARRAY_BUFFER, ib->obj); - _mesa_reference_buffer_object(ctx, &tmp_ib.obj, - ctx->Shared->NullBufferObj); + tmp_ib.obj = ctx->Shared->NullBufferObj; tmp_ib.ptr = tmp_indices; tmp_ib.count = ib->count; tmp_ib.type = ib->type; |