diff options
author | Brian Paul <brianp@vmware.com> | 2009-05-07 13:30:39 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-05-07 14:34:09 -0600 |
commit | 4f6b704f9796775d8d9937c3cf75a2901b99b896 (patch) | |
tree | 9a5ac7599b7e6f7148b031358b2671a78fbf01ac /src/mesa/main/mtypes.h | |
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/main/mtypes.h')
-rw-r--r-- | src/mesa/main/mtypes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index affb000b8c..3debbe9f2d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1593,7 +1593,6 @@ struct gl_array_attrib GLbitfield NewState; /**< mask of _NEW_ARRAY_* values */ #if FEATURE_ARB_vertex_buffer_object - struct gl_buffer_object *NullBufferObj; struct gl_buffer_object *ArrayBufferObj; struct gl_buffer_object *ElementArrayBufferObj; #endif @@ -2064,6 +2063,8 @@ struct gl_shared_state GLuint TextureStateStamp; /**< state notification for shared tex */ /*@}*/ + /** Default buffer object for vertex arrays that aren't in VBOs */ + struct gl_buffer_object *NullBufferObj; /** * \name Vertex/fragment programs |