Attachment 92096 Details for Bug 72926 – proposed fix for the bug

proposed fix for the bug

llvm-fix.patch (text/plain), 1.79 KB, created by Brian Paul on 2014-01-14 22:25:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2014-01-14 22:25:02 UTC

Size: 1.79 KB

patch

obsolete

>diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
>index 9f17241..7e3007d 100644
>--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
>+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
>@@ -141,19 +141,11 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle,
>    struct draw_geometry_shader *gs = draw->gs.geometry_shader;
>    const unsigned out_prim = gs ? gs->output_primitive :
>       u_assembled_prim(in_prim);
>-   const unsigned nr = MAX2(vs->info.num_inputs,
>-                            draw_total_vs_outputs(draw));
>+   unsigned nr;
> 
>    fpme->input_prim = in_prim;
>    fpme->opt = opt;
> 
>-   /* Always leave room for the vertex header whether we need it or
>-    * not.  It's hard to get rid of it in particular because of the
>-    * viewport code in draw_pt_post_vs.c.
>-    */
>-   fpme->vertex_size = sizeof(struct vertex_header) + nr * 4 * sizeof(float);
>-
>-
>    draw_pt_post_vs_prepare( fpme->post_vs,
>                             draw->clip_xy,
>                             draw->clip_z,
>@@ -177,6 +169,18 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle,
>       *max_vertices = 4096;
>    }
> 
>+   /* Get the number of float[4] attributes per vertex.
>+    * Note: this must be done after draw_pe_emit_prepare() since that
>+    * can effect the vertex size.
>+    */
>+   nr = MAX2(vs->info.num_inputs, draw_total_vs_outputs(draw));
>+
>+   /* Always leave room for the vertex header whether we need it or
>+    * not.  It's hard to get rid of it in particular because of the
>+    * viewport code in draw_pt_post_vs.c.
>+    */
>+   fpme->vertex_size = sizeof(struct vertex_header) + nr * 4 * sizeof(float);
>+
>    /* return even number */
>    *max_vertices = *max_vertices & ~1;
>

Actions: View

Attachments on bug 72926: 91053 | 91216 | 91257 | 91336 | 92000 | 92001 | 92053 | 92081 | 92096

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.