gallium/radeon: s/dcc_disable/disable_dcc/

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Edmondo Tommasina <edmondo.tommasina@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index eb823b2e700a81dbae085c40adcbca37d720de9d..2feca0172faf37b89b8ba0915d28004467983e05 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -801,7 +801,7 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen,
                                        const struct pipe_resource *templ);
 bool vi_dcc_formats_compatible(enum pipe_format format1,
                               enum pipe_format format2);
-void vi_dcc_disable_if_incompatible_format(struct r600_common_context *rctx,
+void vi_disable_dcc_if_incompatible_format(struct r600_common_context *rctx,
                                           struct pipe_resource *tex,
                                           unsigned level,
                                           enum pipe_format view_format);

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 3cf1bb7648200ca77e6fbc08e1383f32a0267096..75e8c77cfd25dc6201ab7a9eb851a4c8984a91d0 100644 (file)
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -1905,7 +1905,7 @@ bool vi_dcc_formats_compatible(enum pipe_format format1,
               type1 == type2;
 }
 
-void vi_dcc_disable_if_incompatible_format(struct r600_common_context *rctx,
+void vi_disable_dcc_if_incompatible_format(struct r600_common_context *rctx,
                                           struct pipe_resource *tex,
                                           unsigned level,
                                           enum pipe_format view_format)
@@ -1945,7 +1945,7 @@ struct pipe_surface *r600_create_surface_custom(struct pipe_context *pipe,
        surface->height0 = height0;
 
        if (texture->target != PIPE_BUFFER)
-               vi_dcc_disable_if_incompatible_format(rctx, texture,
+               vi_disable_dcc_if_incompatible_format(rctx, texture,
                                                      templ->u.tex.level,
                                                      templ->format);
 

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 864c5be58c7b990e3996be7d27e0771ab3970430..9b3096d734ff2cb090ad21a79a4ca28487045bdf 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -946,9 +946,9 @@ void si_resource_copy_region(struct pipe_context *ctx,
                }
        }
 
-       vi_dcc_disable_if_incompatible_format(&sctx->b, dst, dst_level,
+       vi_disable_dcc_if_incompatible_format(&sctx->b, dst, dst_level,
                                              dst_templ.format);
-       vi_dcc_disable_if_incompatible_format(&sctx->b, src, src_level,
+       vi_disable_dcc_if_incompatible_format(&sctx->b, src, src_level,
                                              src_templ.format);
 
        /* Initialize the surface. */
@@ -1148,10 +1148,10 @@ static void si_blit(struct pipe_context *ctx,
 
        /* The driver doesn't decompress resources automatically while
         * u_blitter is rendering. */
-       vi_dcc_disable_if_incompatible_format(&sctx->b, info->src.resource,
+       vi_disable_dcc_if_incompatible_format(&sctx->b, info->src.resource,
                                              info->src.level,
                                              info->src.format);
-       vi_dcc_disable_if_incompatible_format(&sctx->b, info->dst.resource,
+       vi_disable_dcc_if_incompatible_format(&sctx->b, info->dst.resource,
                                              info->dst.level,
                                              info->dst.format);
        si_decompress_subresource(ctx, info->src.resource, info->mask,
@@ -1183,7 +1183,7 @@ static boolean si_generate_mipmap(struct pipe_context *ctx,
 
        /* The driver doesn't decompress resources automatically while
         * u_blitter is rendering. */
-       vi_dcc_disable_if_incompatible_format(&sctx->b, tex, base_level,
+       vi_disable_dcc_if_incompatible_format(&sctx->b, tex, base_level,
                                              format);
        si_decompress_subresource(ctx, tex, PIPE_MASK_RGBAZS,
                                  base_level, first_layer, last_layer);

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 14138fbd9826f16a852ec874ccf4d02ad382d55e..866c20639945196b011b9da7abfc6587db993a5e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3408,7 +3408,7 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
                }
        }
 
-       vi_dcc_disable_if_incompatible_format(&sctx->b, texture,
+       vi_disable_dcc_if_incompatible_format(&sctx->b, texture,
                                              state->u.tex.first_level,
                                              state->format);