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/main/arrayobj.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/main/arrayobj.c')
| -rw-r--r-- | src/mesa/main/arrayobj.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 1283940f7fd..a0c9b11ebd5 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -133,6 +133,7 @@ _mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj ) { (void) ctx; unbind_array_object_vbos(ctx, obj); + _mesa_reference_buffer_object(ctx, &obj->ElementArrayBufferObj, NULL); _glthread_DESTROY_MUTEX(obj->Mutex); free(obj); } @@ -252,6 +253,9 @@ _mesa_initialize_array_object( struct gl_context *ctx, #if FEATURE_point_size_array init_array(ctx, &obj->PointSize, 1, GL_FLOAT); #endif + + _mesa_reference_buffer_object(ctx, &obj->ElementArrayBufferObj, + ctx->Shared->NullBufferObj); } |