From 06579faa9d47d62e5641855dd241b9af169649c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Fr=C3=B6hlich?= Date: Fri, 10 Aug 2018 11:37:43 +0200 Subject: [PATCH] tnl: Fix green gun regression in xonotic. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix an other regression of 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. Fixes: 64d2a204805 mesa: Make gl_vertex_array contain pointers to first order VAO members. Tested-by: Ville Syrjälä Reviewed-by: Ian Romanick Signed-off-by: Mathias Fröhlich (cherry picked from commit a6232b69321b465e9733a4b207088d923b75e714) Conflicts resolved by Dylan Conflicts: src/mesa/tnl/t_split_copy.c --- 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 f76a470b5ff..30fe50042af 100644 --- a/src/mesa/tnl/t_split_copy.c +++ b/src/mesa/tnl/t_split_copy.c @@ -519,7 +519,7 @@ replay_init(struct copy_context *copy) for (offset = 0, i = 0; i < copy->nr_varying; i++) { const struct gl_vertex_array *src = copy->varying[i].array; const struct gl_array_attributes *srcattr = src->VertexAttrib; - struct gl_vertex_array *dst = ©->dstarray[i]; + struct gl_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;