radeonsi: clean up decompress blend state names

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

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 500c5bf..333f9cf 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -433,9 +433,9 @@ static void si_blit_decompress_color(struct pipe_context *ctx,
                                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;
        }
 
        while (level_mask) {

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 805392d..cb37226 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -76,10 +76,10 @@ static void si_destroy_context(struct pipe_context *context)
                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);
 

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index e917cb1..03e4133 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -232,8 +232,8 @@ struct si_context {
        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;
 

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index ae7c91f..28f5709 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3990,8 +3990,8 @@ void si_init_state_functions(struct si_context *sctx)
 
        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;