diff options
| author | Brian Paul <[email protected]> | 2009-05-07 13:30:39 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-05-07 14:34:09 -0600 |
| commit | 4f6b704f9796775d8d9937c3cf75a2901b99b896 (patch) | |
| tree | 9a5ac7599b7e6f7148b031358b2671a78fbf01ac /src/mesa/vbo/vbo_exec_api.c | |
| parent | 105c8529e78db961fee832b6248c3bcf59668bad (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_exec_api.c')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 5d35ec9c111..6871ee5cab1 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -671,7 +671,7 @@ void vbo_use_buffer_objects(GLcontext *ctx) GLsizei size = VBO_VERT_BUFFER_SIZE; /* Make sure this func is only used once */ - assert(exec->vtx.bufferobj == ctx->Array.NullBufferObj); + assert(exec->vtx.bufferobj == ctx->Shared->NullBufferObj); if (exec->vtx.buffer_map) { _mesa_align_free(exec->vtx.buffer_map); exec->vtx.buffer_map = NULL; @@ -697,7 +697,7 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec ) */ _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, - ctx->Array.NullBufferObj); + ctx->Shared->NullBufferObj); ASSERT(!exec->vtx.buffer_map); exec->vtx.buffer_map = (GLfloat *)ALIGN_MALLOC(VBO_VERT_BUFFER_SIZE, 64); |