[Mesa-dev] [PATCH 5/5] radeonsi: clean up decompress blend state names

[Nicolai Hähnle]

Assuming no regressions, patches 1,2,4,5 are:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


On 06.06.2017 16:30, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> ---
>   src/gallium/drivers/radeonsi/si_blit.c  | 4 ++--
>   src/gallium/drivers/radeonsi/si_pipe.c  | 8 ++++----
>   src/gallium/drivers/radeonsi/si_pipe.h  | 4 ++--
>   src/gallium/drivers/radeonsi/si_state.c | 4 ++--
>   4 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
> index 59334db..46cb646 100644
> --- a/src/gallium/drivers/radeonsi/si_blit.c
> +++ b/src/gallium/drivers/radeonsi/si_blit.c
> @@ -438,23 +438,23 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
>   
>   	if (rtex->dcc_offset && need_dcc_decompress) {
>   		custom_blend = sctx->custom_blend_dcc_decompress;
>   
>   		/* disable levels without DCC */
>   		for (int i = first_level; i <= last_level; i++) {
>   			if (!vi_dcc_enabled(rtex, i))
>   				level_mask &= ~(1 << i);
>   		}
>   	} else if (rtex->fmask.size) {
> -		custom_blend = sctx->custom_blend_decompress;
> +		custom_blend = sctx->custom_blend_fmask_decompress;
>   	} else {
> -		custom_blend = sctx->custom_blend_fastclear;
> +		custom_blend = sctx->custom_blend_eliminate_fastclear;
>   	}
>   
>   	bool old_update_dirtiness = sctx->framebuffer.do_update_surf_dirtiness;
>   	sctx->decompression_enabled = true;
>   	sctx->framebuffer.do_update_surf_dirtiness = false;
>   
>   	while (level_mask) {
>   		unsigned level = u_bit_scan(&level_mask);
>   
>   		/* The smaller the mipmap level, the less layers there are
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
> index 805392d..cb37226 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -69,24 +69,24 @@ static void si_destroy_context(struct pipe_context *context)
>   		si_pm4_free_state(sctx, sctx->init_config_gs_rings, ~0);
>   	for (i = 0; i < ARRAY_SIZE(sctx->vgt_shader_config); i++)
>   		si_pm4_delete_state(sctx, vgt_shader_config, sctx->vgt_shader_config[i]);
>   
>   	if (sctx->fixed_func_tcs_shader.cso)
>   		sctx->b.b.delete_tcs_state(&sctx->b.b, sctx->fixed_func_tcs_shader.cso);
>   	if (sctx->custom_dsa_flush)
>   		sctx->b.b.delete_depth_stencil_alpha_state(&sctx->b.b, sctx->custom_dsa_flush);
>   	if (sctx->custom_blend_resolve)
>   		sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_resolve);
> -	if (sctx->custom_blend_decompress)
> -		sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_decompress);
> -	if (sctx->custom_blend_fastclear)
> -		sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_fastclear);
> +	if (sctx->custom_blend_fmask_decompress)
> +		sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_fmask_decompress);
> +	if (sctx->custom_blend_eliminate_fastclear)
> +		sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_eliminate_fastclear);
>   	if (sctx->custom_blend_dcc_decompress)
>   		sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_dcc_decompress);
>   
>   	if (sctx->blitter)
>   		util_blitter_destroy(sctx->blitter);
>   
>   	r600_common_context_cleanup(&sctx->b);
>   
>   	LLVMDisposeTargetMachine(sctx->tm);
>   
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
> index db747d6..108929c 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.h
> +++ b/src/gallium/drivers/radeonsi/si_pipe.h
> @@ -226,22 +226,22 @@ union si_vgt_param_key {
>   		unsigned _pad:32 - SI_NUM_VGT_PARAM_KEY_BITS;
>   	} u;
>   	uint32_t index;
>   };
>   
>   struct si_context {
>   	struct r600_common_context	b;
>   	struct blitter_context		*blitter;
>   	void				*custom_dsa_flush;
>   	void				*custom_blend_resolve;
> -	void				*custom_blend_decompress;
> -	void				*custom_blend_fastclear;
> +	void				*custom_blend_fmask_decompress;
> +	void				*custom_blend_eliminate_fastclear;
>   	void				*custom_blend_dcc_decompress;
>   	struct si_screen		*screen;
>   
>   	struct radeon_winsys_cs		*ce_ib;
>   	struct radeon_winsys_cs		*ce_preamble_ib;
>   	struct r600_resource		*ce_ram_saved_buffer;
>   	unsigned			ce_ram_saved_offset;
>   	unsigned			total_ce_ram_allocated;
>   	bool				ce_need_synchronization;
>   	struct u_suballocator		*ce_suballocator;
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index 323ec5e..28dcec0 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -4071,22 +4071,22 @@ void si_init_state_functions(struct si_context *sctx)
>   	sctx->b.b.create_rasterizer_state = si_create_rs_state;
>   	sctx->b.b.bind_rasterizer_state = si_bind_rs_state;
>   	sctx->b.b.delete_rasterizer_state = si_delete_rs_state;
>   
>   	sctx->b.b.create_depth_stencil_alpha_state = si_create_dsa_state;
>   	sctx->b.b.bind_depth_stencil_alpha_state = si_bind_dsa_state;
>   	sctx->b.b.delete_depth_stencil_alpha_state = si_delete_dsa_state;
>   
>   	sctx->custom_dsa_flush = si_create_db_flush_dsa(sctx);
>   	sctx->custom_blend_resolve = si_create_blend_custom(sctx, V_028808_CB_RESOLVE);
> -	sctx->custom_blend_decompress = si_create_blend_custom(sctx, V_028808_CB_FMASK_DECOMPRESS);
> -	sctx->custom_blend_fastclear = si_create_blend_custom(sctx, V_028808_CB_ELIMINATE_FAST_CLEAR);
> +	sctx->custom_blend_fmask_decompress = si_create_blend_custom(sctx, V_028808_CB_FMASK_DECOMPRESS);
> +	sctx->custom_blend_eliminate_fastclear = si_create_blend_custom(sctx, V_028808_CB_ELIMINATE_FAST_CLEAR);
>   	sctx->custom_blend_dcc_decompress = si_create_blend_custom(sctx, V_028808_CB_DCC_DECOMPRESS);
>   
>   	sctx->b.b.set_clip_state = si_set_clip_state;
>   	sctx->b.b.set_stencil_ref = si_set_stencil_ref;
>   
>   	sctx->b.b.set_framebuffer_state = si_set_framebuffer_state;
>   	sctx->b.b.get_sample_position = cayman_get_sample_position;
>   
>   	sctx->b.b.create_sampler_state = si_create_sampler_state;
>   	sctx->b.b.delete_sampler_state = si_delete_sampler_state;
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.