From: Dave Airlie Date: Mon, 31 Aug 2015 04:22:23 +0000 (+1000) Subject: r600/sb: update last_cf for finalize if. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3063913f77cd2db1a263cb824a5c8c3dcc1a51a0;p=mesa.git r600/sb: update last_cf for finalize if. As Glenn did for finalize_loop we need to update_cf when we add a POP at the end of a shader. I think this fixes one of the earlier shader going off end of memory problems we've stopped. Reviewed-by: Glenn Kennard Cc: "10.6" "11.0" Signed-off-by: Dave Airlie --- diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp index 8c2cd1460e5..dadee456a1f 100644 --- a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp +++ b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp @@ -199,6 +199,9 @@ void bc_finalizer::finalize_if(region_node* r) { cf_node *if_jump = sh.create_cf(CF_OP_JUMP); cf_node *if_pop = sh.create_cf(CF_OP_POP); + if (!last_cf || last_cf->get_parent_region() == r) { + last_cf = if_pop; + } if_pop->bc.pop_count = 1; if_pop->jump_after(if_pop);