This reverts commit 57cd3267782fcf92d1e7d772760956516d4367df. This fixes piglit regressions with additional draw stages on llvmpipe, softpipe and i915g. The attributes can't be cleared at this point because they might be in use by the additional draw stages.
https://bugs.freedesktop.org/show_bug.cgi?id=67963 https://bugs.freedesktop.org/show_bug.cgi?id=67965 https://bugs.freedesktop.org/show_bug.cgi?id=67966 Conflicts: src/gallium/auxiliary/draw/draw_context.c --- src/gallium/auxiliary/draw/draw_context.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index d1fac0c..c131386 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -561,7 +561,6 @@ draw_get_shader_info(const struct draw_context *draw) void draw_prepare_shader_outputs(struct draw_context *draw) { - draw_remove_extra_vertex_attribs(draw); draw_prim_assembler_prepare_outputs(draw->ia); draw_unfilled_prepare_outputs(draw, draw->pipeline.unfilled); draw_aapoint_prepare_outputs(draw, draw->pipeline.aapoint); -- 1.8.1.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
