diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-10 13:44:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-12 16:01:02 -0600 |
| commit | d7ea9ddf5824556e47decac7ba200f37cf1e552f (patch) | |
| tree | e1c009acb8703db7b83eb118d4dbe48ffd536982 | |
| parent | 193177b732175970c2ebec1faf88dc2efee57693 (diff) | |
mesa: use _mesa_reference_buffer_object() in a few places
| -rw-r--r-- | src/mesa/vbo/vbo_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_rebase.c | 4 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_split_copy.c | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index 90025f62fc..75c32e0b9b 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -153,7 +153,8 @@ static void init_mat_currval(GLcontext *ctx) cl->Stride = 0; cl->StrideB = 0; cl->Enabled = 1; - cl->BufferObj = ctx->Shared->NullBufferObj; + _mesa_reference_buffer_object(ctx, &cl->BufferObj, + ctx->Shared->NullBufferObj); } } diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c index ea87dede64..2fcaba2364 100644 --- a/src/mesa/vbo/vbo_rebase.c +++ b/src/mesa/vbo/vbo_rebase.c @@ -49,6 +49,7 @@ #include "main/glheader.h" #include "main/imports.h" #include "main/mtypes.h" +#include "main/bufferobj.h" #include "vbo.h" @@ -161,7 +162,8 @@ void vbo_rebase_prims( GLcontext *ctx, GL_ELEMENT_ARRAY_BUFFER, ib->obj); - tmp_ib.obj = ctx->Shared->NullBufferObj; + _mesa_reference_buffer_object(ctx, &tmp_ib.obj, + ctx->Shared->NullBufferObj); tmp_ib.ptr = tmp_indices; tmp_ib.count = ib->count; tmp_ib.type = ib->type; diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c index dcb14c868b..2725cc82b7 100644 --- a/src/mesa/vbo/vbo_split_copy.c +++ b/src/mesa/vbo/vbo_split_copy.c @@ -30,6 +30,7 @@ */ #include "main/glheader.h" +#include "main/bufferobj.h" #include "main/imports.h" #include "main/image.h" #include "main/macros.h" @@ -517,7 +518,8 @@ replay_init( struct copy_context *copy ) dst->Ptr = copy->dstbuf + offset; dst->Enabled = GL_TRUE; dst->Normalized = src->Normalized; - dst->BufferObj = ctx->Shared->NullBufferObj; + _mesa_reference_buffer_object(ctx, &dst->BufferObj, + ctx->Shared->NullBufferObj); dst->_MaxElement = copy->dstbuf_size; /* may be less! */ offset += copy->varying[i].size; @@ -537,7 +539,8 @@ replay_init( struct copy_context *copy ) */ copy->dstib.count = 0; /* duplicates dstelt_nr */ copy->dstib.type = GL_UNSIGNED_INT; - copy->dstib.obj = ctx->Shared->NullBufferObj; + _mesa_reference_buffer_object(ctx, ©->dstib.obj, + ctx->Shared->NullBufferObj); copy->dstib.ptr = copy->dstelt; } |