From c989661985dc67ed3ec31887e37e0ce455b5b381 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathias=20Fr=C3=B6hlich?= Date: Mon, 29 Apr 2019 07:23:58 +0200 Subject: [PATCH] mesa: Leave aliasing of vertex and generic0 attribute to the dlist code. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Now that dlist compilation again knows if it is inside glBegin/glEnd, we can leave the decision if aliasing should occur to the vertex attribute setter functions instead of doing that at glArrayElement time. Reviewed-by: Brian Paul Signed-off-by: Mathias Fröhlich --- src/mesa/main/api_arrayelt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 6e367839834..51a7d63b83e 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -1450,10 +1450,7 @@ _mesa_array_element(struct gl_context *ctx, GLint elt) const gl_vert_attrib attrib = VERT_ATTRIB_GENERIC0; const struct gl_array_attributes *array = &vao->VertexAttrib[attrib]; const void *src = attrib_src(vao, array, elt); - /* Use glVertex(v) instead of glVertexAttrib(0, v) to be sure it's - * issued as the last (provoking) attribute). - */ - func_nv(&array->Format)(0, src); + func_arb(&array->Format)(0, src); } else if (vao->Enabled & VERT_BIT_POS) { const gl_vert_attrib attrib = VERT_ATTRIB_POS; const struct gl_array_attributes *array = &vao->VertexAttrib[attrib]; -- 2.30.2