diff options
| author | Yuanhan Liu <[email protected]> | 2011-11-23 15:59:06 +0800 |
|---|---|---|
| committer | Yuanhan Liu <[email protected]> | 2011-11-29 09:48:50 +0800 |
| commit | a0a5bd4bb30a73c10b02c3c3b914940a03f9b790 (patch) | |
| tree | bb5dccc34cb8b0a0d97b2164cb8bff1c61a185d0 /src/mesa/vbo/vbo_save_api.c | |
| parent | 4ff212aac3764565675c9c83af378671162bc4f2 (diff) | |
mesa: move ElementArrayBufferObj to gl_array_object
According opengl spec 4.2.pdf table 6.12 (Vertex Array Object State) at
page 515, the element buffer object is listed in vertex array object.
So, move the ElementArrayBufferObj inside gl_array_object to make
element buffer object per-vao.
This would fix most of(3 left) intel oglc vao test fail
NOTE: this is a candidate for the 7.11 branch.
Signed-off-by: Yuanhan Liu <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_save_api.c')
| -rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 64da7ac4993..9d8bada04cf 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1119,9 +1119,9 @@ _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum type, _ae_map_vbos(ctx); - if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) + if (_mesa_is_bufferobj(ctx->Array.ArrayObj->ElementArrayBufferObj)) indices = - ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices); + ADD_POINTERS(ctx->Array.ArrayObj->ElementArrayBufferObj->Pointer, indices); vbo_save_NotifyBegin(ctx, (mode | VBO_SAVE_PRIM_WEAK | VBO_SAVE_PRIM_NO_CURRENT_UPDATE)); |