aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Fröhlich <[email protected]>2019-04-29 07:23:58 +0200
committerMathias Fröhlich <[email protected]>2019-05-04 07:40:35 +0200
commitc989661985dc67ed3ec31887e37e0ce455b5b381 (patch)
tree35c4dc15fa8f3ef1394293e7cc258448b1d5d58b
parentc869387d8aa9c9c00a159a922dee4e66db49aa05 (diff)
mesa: Leave aliasing of vertex and generic0 attribute to the dlist code.
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 <[email protected]> Signed-off-by: Mathias Fröhlich <[email protected]>
-rw-r--r--src/mesa/main/api_arrayelt.c5
1 files changed, 1 insertions, 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];