diff options
| author | Zack Rusin <[email protected]> | 2013-08-02 01:39:35 -0400 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2013-08-02 20:11:18 -0400 |
| commit | 05487ef88ded5fea0b1de7bc08d44846648d1ce2 (patch) | |
| tree | 5a97df0f2d48c4c6e008be4eba0922d99a5304fb /src/gallium/auxiliary/draw/draw_vs_variant.c | |
| parent | 2e46a1dcb33618f2873ebaaeb3ffe238f11a31a3 (diff) | |
draw: stop crashing with extra shader outputs
Draw sometimes injects extra shader outputs (aa points, lines or
front face), unfortunately most of the pipeline and llvm code
didn't handle them at all. It only worked if number of inputs
happened to be bigger or equal to the number of shader outputs
plus the extra injected outputs. In particular when running
the pipeline which depends on the vertex_id in the vertex_header
things were completely broken. The patch adjust the code to
correctly use the total number of shader outputs (the standard
ones plus the injected ones) to make it all stop crashing and
work.
Signed-off-by: Zack Rusin <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_vs_variant.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_vs_variant.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs_variant.c b/src/gallium/auxiliary/draw/draw_vs_variant.c index 37500c7db8d..9045b638444 100644 --- a/src/gallium/auxiliary/draw/draw_vs_variant.c +++ b/src/gallium/auxiliary/draw/draw_vs_variant.c @@ -315,7 +315,7 @@ draw_vs_create_variant_generic( struct draw_vertex_shader *vs, vsvg->draw = vs->draw; vsvg->temp_vertex_stride = MAX2(key->nr_inputs, - vsvg->base.vs->info.num_outputs) * 4 * sizeof(float); + draw_total_vs_outputs(vs->draw)) * 4 * sizeof(float); /* Build free-standing fetch and emit functions: */ |