On 08/21/2018 09:57 PM, mathias.froehl...@gmx.net wrote: > From: Mathias Fröhlich <mathias.froehl...@web.de> > > Hi Ville, Brian, > > The below patch fixes the regression to tnl drivers that Ville reported > a hand full weeks ago. > Please review! > > best > Mathias > > > Fix an other regression of patch 64d2a2048054 > mesa: Make gl_vertex_array contain pointers to first order VAO members.
Rewrite the as Fixes: 64d2a204805 ("mesa: Make gl_vertex_array contain pointers to first order VAO members.") and put it down with the *-by: lines below so that it can be applied to the correct release branches. > 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.syrj...@linux.intel.com> > Signed-off-by: Mathias Fröhlich <mathias.froehl...@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 = ©->dstarray[i]; > + struct tnl_vertex_array *dst = ©->dstarray[copy->varying[i].attr]; > struct gl_vertex_buffer_binding *dstbind = > ©->varying[i].dstbinding; > struct gl_array_attributes *dstattr = ©->varying[i].dstattribs; > I don't know this code very well, but this seems to better match the original (before 64d2a204805). Since it works for Ville and passes the Intel CI, Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev