[Mesa-dev] [PATCH] mesa: distinct gl_client_array arrays are gone

[Jose Fonseca]

It looks like there is a regression, https://bugs.freedesktop.org/show_bug.cgi?id=43353 . Can you investigate this?

Jose

----- Original Message -----
> 
> Hi,
> 
> Apologies for braking this!
> Thanks, looks great.
> 
> Mathias
> 
> On Tuesday, November 29, 2011 08:22:58 Chia-I Wu wrote:
> > From: Chia-I Wu <olv at lunarg.com>
> > 
> > Fix build errors since 762c9766c93697af8d7fbaa729aed118789dbe8e.
> > ---
> >  src/mesa/main/ffvertex_prog.c |    2 +-
> >  src/mesa/main/get.c           |    6 +++---
> >  src/mesa/main/varray.c        |    2 --
> >  3 files changed, 4 insertions(+), 6 deletions(-)
> > 
> > diff --git a/src/mesa/main/ffvertex_prog.c
> > b/src/mesa/main/ffvertex_prog.c
> > index f88110f..19d319a 100644
> > --- a/src/mesa/main/ffvertex_prog.c
> > +++ b/src/mesa/main/ffvertex_prog.c
> > @@ -230,7 +230,7 @@ static void make_state_key( struct gl_context
> > *ctx,
> > struct state_key *key ) key->point_attenuated = 1;
> > 
> >  #if FEATURE_point_size_array
> > -   if (ctx->Array.ArrayObj->PointSize.Enabled)
> > +   if
> > (ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled)
> >        key->point_array = 1;
> >  #endif
> > 
> > diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> > index a97ba3a..4df6afe 100644
> > --- a/src/mesa/main/get.c
> > +++ b/src/mesa/main/get.c
> > @@ -676,9 +676,9 @@ static const struct value_desc values[] = {
> >     { GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES },
> > 
> >     /* OES_point_size_array */
> > -   { GL_POINT_SIZE_ARRAY_OES, ARRAY_FIELD(PointSize.Enabled,
> > TYPE_BOOLEAN)
> > }, -   { GL_POINT_SIZE_ARRAY_TYPE_OES, ARRAY_FIELD(PointSize.Type,
> > TYPE_ENUM) }, -   { GL_POINT_SIZE_ARRAY_STRIDE_OES,
> > ARRAY_FIELD(PointSize.Stride, TYPE_INT) }, +   {
> > GL_POINT_SIZE_ARRAY_OES,
> > ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled,
> > TYPE_BOOLEAN) },
> > +   { GL_POINT_SIZE_ARRAY_TYPE_OES,
> > ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM)
> > }, +   {
> > GL_POINT_SIZE_ARRAY_STRIDE_OES,
> > ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Stride, TYPE_INT)
> > }, {
> > GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES, LOC_CUSTOM, TYPE_INT, 0 },
> > #endif
> > /* FEATURE_ES1 */
> > 
> > diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
> > index fdcd877..cfb0aa2 100644
> > --- a/src/mesa/main/varray.c
> > +++ b/src/mesa/main/varray.c
> > @@ -341,8 +341,6 @@ _mesa_TexCoordPointer(GLint size, GLenum type,
> > GLsizei
> > stride, if (ctx->API == API_OPENGLES)
> >        legalTypes |= BYTE_BIT;
> > 
> > -   ASSERT(unit < Elements(ctx->Array.ArrayObj->TexCoord));
> > -
> >     update_array(ctx, "glTexCoordPointer", VERT_ATTRIB_TEX(unit),
> >                  legalTypes, 1, 4,
> >                  size, type, stride, GL_FALSE, GL_FALSE,
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>