fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 09:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

draw: additional fix for the no-position case with llvm

Browse source 
Similar fix to what is done for the non-llvm case, we could otherwise still
hit the stages (near certainly with gs) which crash. It is probably a much
better idea to skip trying to draw at that point anyway.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Roland Scheidegger 2013-03-02 02:29:22 +01:00
parent ea8b2ae8a5
commit c7c7186045
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
View file

@ -300,31 +300,31 @@ llvm_pipeline_generic( struct draw_pt_middle_end *middle,
FREE(vert_info->verts);
vert_info = &gs_vert_info;
prim_info = &gs_prim_info;
clipped = draw_pt_post_vs_run( fpme->post_vs, vert_info );
}
/* stream output needs to be done before clipping */
draw_pt_so_emit( fpme->so_emit,
vert_info,
prim_info );
draw_pt_so_emit( fpme->so_emit, vert_info, prim_info );
if (clipped) {
opt |= PT_PIPELINE;
}
/* Do we need to run the pipeline? Now will come here if clipped
/*
* if there's no position, need to stop now, or the latter stages
* will try to access non-existent position output.
*/
if (opt & PT_PIPELINE) {
pipeline( fpme,
vert_info,
prim_info );
}
else {
emit( fpme->emit,
vert_info,
prim_info );
if (draw_current_shader_position_output(draw) != -1) {
if ((opt & PT_SHADE) && gshader) {
clipped = draw_pt_post_vs_run( fpme->post_vs, vert_info );
}
if (clipped) {
opt |= PT_PIPELINE;
}
/* Do we need to run the pipeline? Now will come here if clipped
*/
if (opt & PT_PIPELINE) {
pipeline( fpme, vert_info, prim_info );
}
else {
emit( fpme->emit, vert_info, prim_info );
}
}
FREE(vert_info->verts);
}