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 <glenn.kennard@gmail.com>
Cc: "10.6" "11.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
index 8c2cd1460e53e81db4340e2797588ba3c327cd43..dadee456a1f2d2f7a8fd8aab81d14ef822278f35 100644 (file)
--- 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);