diff options
| author | Dave Airlie <[email protected]> | 2015-08-31 14:22:23 +1000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-09-06 18:28:33 +0100 |
| commit | fb119b22602afb9e137c3c59d9b846ea9a46356a (patch) | |
| tree | 896ed5d7d474224965b2d7d6b210d2e255c1eea7 | |
| parent | 50306a33b4eef89e735fc2dedf6f6540a445290c (diff) | |
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 <[email protected]>
Cc: "10.6" "11.0" <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
(cherry picked from commit 3063913f77cd2db1a263cb824a5c8c3dcc1a51a0)
| -rw-r--r-- | src/gallium/drivers/r600/sb/sb_bc_finalize.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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); |