Module: Mesa Branch: staging/18.2 Commit: 849312df6b7c5020fc874d6c189bc0e391ddaa0e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=849312df6b7c5020fc874d6c189bc0e391ddaa0e
Author: Mathias Fröhlich <[email protected]> Date: Fri Aug 10 11:37:43 2018 +0200 tnl: Fix green gun regression in xonotic. 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ä <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Signed-off-by: Mathias Fröhlich <[email protected]> (cherry picked from commit a6232b69321b465e9733a4b207088d923b75e714) --- 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; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
