[Mesa-dev] [PATCH 4/7] gallium/radeon: simplify restoring render condition after flush

[Nicolai Hähnle]

On 08.11.2015 22:48, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
>   src/gallium/drivers/radeon/r600_pipe_common.c | 22 +++++-----------------
>   src/gallium/drivers/radeon/r600_pipe_common.h |  4 ----
>   2 files changed, 5 insertions(+), 21 deletions(-)
>
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 8739914..224da11 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
[snip]
> @@ -173,12 +162,11 @@ void r600_postflush_resume_features(struct r600_common_context *ctx)
>   		r600_resume_timer_queries(ctx);
>   	}
>
> -	/* Re-enable render condition. */
> -	if (ctx->saved_render_cond) {
> -		ctx->b.render_condition(&ctx->b, ctx->saved_render_cond,
> -					  ctx->saved_render_cond_cond,
> -					  ctx->saved_render_cond_mode);
> -	}
> +	/* Just re-emit PKT3_SET_PREDICATION. */
> +	if (ctx->current_render_cond)
> +		ctx->b.render_condition(&ctx->b, ctx->current_render_cond,
> +					ctx->current_render_cond_cond,
> +					ctx->current_render_cond_mode);

Drop the "Just" from the comment, because while it makes sense in the 
context of the diff, it does not make sense when only looking at the new 
code.

Nicolai