[Mesa-dev] [PATCH] tnl: Fix green gun regression in xonotic.

[Dylan Baker]

Quoting Mathias Fröhlich (2018-09-06 09:56:45)
> Hi Dylan,
> 
> On Thursday, 6 September 2018 18:11:55 CEST Dylan Baker wrote:
> > > Fix an other regression of patch 64d2a2048054
> > > mesa: Make gl_vertex_array contain pointers to first order VAO members.
> > > The regression showed up with drivers using the tnl module and
> > > was reproducible using xonotic-glx -benchmark demos/the-big-keybench.dem.
> > > 
> > > This patch survives intels CI system without changes in the tests.
> > > 
> > > Tested-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
> > > ---
> > >  src/mesa/tnl/t_split_copy.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/src/mesa/tnl/t_split_copy.c b/src/mesa/tnl/t_split_copy.c
> > > index cbb7eb409f..085ae9a28c 100644
> > > --- a/src/mesa/tnl/t_split_copy.c
> > > +++ b/src/mesa/tnl/t_split_copy.c
> > > @@ -531,7 +531,7 @@ replay_init(struct copy_context *copy)
> > >     for (offset = 0, i = 0; i < copy->nr_varying; i++) {
> > >        const struct tnl_vertex_array *src = copy->varying[i].array;
> > >        const struct gl_array_attributes *srcattr = src->VertexAttrib;
> > > -      struct tnl_vertex_array *dst = &copy->dstarray[i];
> > > +      struct tnl_vertex_array *dst = &copy->dstarray[copy->varying[i].attr];
> > >        struct gl_vertex_buffer_binding *dstbind = &copy->varying[i].dstbinding;
> > >        struct gl_array_attributes *dstattr = &copy->varying[i].dstattribs;
> > >  
> > 
> > Hi Mathias,
> > 
> > This patch was nominated for 18.1 via the Fixes: tag, however, it doesn't apply
> > due to not having "mesa/vbo/tnl: Move gl_vertex_array related stuff to tnl.". I
> > have attempted to resolve the conflicts (they're fairly trivial), but would
> > appreciate if you could have a look at the commit and make sure it's correct:
> > https://gitlab.freedesktop.org/mesa/mesa/commit/0807ec76b5d1d6a404670c87ecd2789b21be35c5
> 
> That one looks perfect.
> 
> I tried to recap all the fixes that I had to apply to wipe up after my VAO changes.
> From what I can see we should be good with 18.1.
> 
> Thanks!
> 
> best
> Mathias
> 
> 
> 

Thanks!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180906/0a207872/attachment.sig>