[Mesa-dev] [PATCH] r600/sb: update last_cf for finalize if.

[Glenn Kennard]

On Mon, 31 Aug 2015 06:23:38 +0200, Dave Airlie <airlied at gmail.com> wrote:

> From: Dave Airlie <airlied at redhat.com>
>
> 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.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/gallium/drivers/r600/sb/sb_bc_finalize.cpp | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp  
> b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
> index e8ed5a2..726e438 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);
>

Reviewed-by: Glenn Kennard <glenn.kennard at gmail.com>