Mesa (master): gallium/radeon: s/dcc_disable/disable_dcc/

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 3b1934d9b6eee8c5533532c128843d0a7d2ca1a3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b1934d9b6eee8c5533532c128843d0a7d2ca1a3

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Mar 29 19:41:48 2017 +0200

gallium/radeon: s/dcc_disable/disable_dcc/

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

---

 src/gallium/drivers/radeon/r600_pipe_common.h |  2 +-
 src/gallium/drivers/radeon/r600_texture.c     |  4 ++--
 src/gallium/drivers/radeonsi/si_blit.c        | 10 +++++-----
 src/gallium/drivers/radeonsi/si_state.c       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index eb823b2e70..2feca0172f 100644
--- 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 3cf1bb7648..75e8c77cfd 100644
--- 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 864c5be58c..9b3096d734 100644
--- 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 14138fbd98..866c206399 100644
--- 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);