summaryrefslogtreecommitdiff
path: root/src/mesa/vbo/vbo_split_copy.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-07 13:30:39 -0600
committerBrian Paul <brianp@vmware.com>2009-05-07 14:34:09 -0600
commit4f6b704f9796775d8d9937c3cf75a2901b99b896 (patch)
tree9a5ac7599b7e6f7148b031358b2671a78fbf01ac /src/mesa/vbo/vbo_split_copy.c
parent105c8529e78db961fee832b6248c3bcf59668bad (diff)
mesa: move the NullBufferObj from GLcontext to gl_shared_state
Since shared array objects may point to the null/default buffer object, the null/default buffer object should be part of the shared state.
Diffstat (limited to 'src/mesa/vbo/vbo_split_copy.c')
-rw-r--r--src/mesa/vbo/vbo_split_copy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 56a9fafac4..2f6a1998ea 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -459,7 +459,7 @@ replay_init( struct copy_context *copy )
dst->Ptr = copy->dstbuf + offset;
dst->Enabled = GL_TRUE;
dst->Normalized = src->Normalized;
- dst->BufferObj = ctx->Array.NullBufferObj;
+ dst->BufferObj = ctx->Shared->NullBufferObj;
dst->_MaxElement = copy->dstbuf_size; /* may be less! */
offset += copy->varying[i].size;
@@ -479,7 +479,7 @@ replay_init( struct copy_context *copy )
*/
copy->dstib.count = 0; /* duplicates dstelt_nr */
copy->dstib.type = GL_UNSIGNED_INT;
- copy->dstib.obj = ctx->Array.NullBufferObj;
+ copy->dstib.obj = ctx->Shared->NullBufferObj;
copy->dstib.ptr = copy->dstelt;
}