diff options
| author | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2011-11-23 15:59:06 +0800 |
|---|---|---|
| committer | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2011-11-29 09:48:50 +0800 |
| commit | a0a5bd4bb30a73c10b02c3c3b914940a03f9b790 (patch) | |
| tree | bb5dccc34cb8b0a0d97b2164cb8bff1c61a185d0 /src/mesa/main/api_arrayelt.c | |
| parent | 4ff212aac3764565675c9c83af378671162bc4f2 (diff) | |
| download | external_mesa3d-a0a5bd4bb30a73c10b02c3c3b914940a03f9b790.zip external_mesa3d-a0a5bd4bb30a73c10b02c3c3b914940a03f9b790.tar.gz external_mesa3d-a0a5bd4bb30a73c10b02c3c3b914940a03f9b790.tar.bz2 | |
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 <yuanhan.liu@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/api_arrayelt.c')
| -rw-r--r-- | src/mesa/main/api_arrayelt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index b93a057..4d9ff43 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -1580,7 +1580,7 @@ static void _ae_update_state( struct gl_context *ctx ) aa++; } - check_vbo(actx, ctx->Array.ElementArrayBufferObj); + check_vbo(actx, arrayObj->ElementArrayBufferObj); ASSERT(at - actx->attribs <= VERT_ATTRIB_MAX); ASSERT(aa - actx->arrays < 32); |