On 02/18/2013 05:27 PM, srol...@vmware.com wrote:
From: Roland Scheidegger<srol...@vmware.com>
Some parts calculated key size by using shader information, others by using
the pipe_vertex_element information. Since it is perfectly valid to have more
vertex_elements set than the vertex shader is using those may not be the same,
so we weren't copying over all vertex_element state - this caused the tgsi dump
to assert (iterates over all vertex elements). With some luck it didn't
crash otherwise even though the llvm generate_fetch code also iterates over
all vertex elements (probably because llvm threw away the unused inputs anyway),
but if in this situation vertex texturing would be used things would definitely
go wrong (as the sampler information wouldn't be copied).
So drop the key size calculation using shader information.
---
src/gallium/auxiliary/draw/draw_llvm.c | 13 ++++++++-----
src/gallium/auxiliary/draw/draw_llvm.h | 1 -
.../draw/draw_pt_fetch_shade_pipeline_llvm.c | 7 ++++++-
src/gallium/auxiliary/draw/draw_vs_llvm.c | 6 ------
4 files changed, 14 insertions(+), 13 deletions(-)
Looks OK to me.
Reviewed-by: Brian Paul <bri...@vmware.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
