[Mesa-dev] [PATCH] mesa: move ElementArrayBufferObj to gl_array_object

[Yuanhan Liu]

On Wed, Nov 23, 2011 at 08:25:59AM -0700, Brian Paul wrote:
> On 11/23/2011 02:26 AM, Yuanhan Liu wrote:
> >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
> >
> >Signed-off-by: Yuanhan Liu<yuanhan.liu at linux.intel.com>
> >---
> >  src/mesa/main/api_arrayelt.c  |    2 +-
> >  src/mesa/main/api_validate.c  |   14 ++++++------
> >  src/mesa/main/arrayobj.c      |    4 +++
> >  src/mesa/main/attrib.c        |    7 ++---
> >  src/mesa/main/bufferobj.c     |    9 ++-----
> >  src/mesa/main/context.c       |    1 -
> >  src/mesa/main/get.c           |    2 +-
> >  src/mesa/main/mtypes.h        |    3 +-
> >  src/mesa/vbo/vbo_exec_array.c |   42 ++++++++++++++++++++--------------------
> >  src/mesa/vbo/vbo_save_api.c   |    4 +-
> >  10 files changed, 44 insertions(+), 44 deletions(-)
> >
> 
> I presume you've done a piglit run to check for regressions.

Nope. But I did test this patch with all intel oglc testcases, and
with no regression. Is this OK?

> 
> Otherwise, looks good to me.  Thanks for finding this mistake and
> fixing it!
My pleasure :)

> 
> I think this should be noted as a candidate for the 7.11 branch.

Right, forgot it again, sorry.  Will add it.

Thanks,
Yuanhan Liu


> 
> Reviewed-by: Brian Paul <brianp at vmware.com>