From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 21 Feb 2012 18:38:42 +0000 (+0100)
Subject: r600g: fixup name of evergreen-specific function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf59ed3f23e8ee72c044ec029127876cf27a4afa;p=mesa.git

r600g: fixup name of evergreen-specific function

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 75fca229025..a58570ef622 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -630,8 +630,8 @@ static const struct r600_reg cayman_context_reg_list[] = {
 	{R_028EAC_CB_COLOR11_DIM, 0, 0},
 };
 
-/* SHADER RESOURCE R600/R700 */
-static int r600_resource_range_init(struct r600_context *ctx, struct r600_range *range, unsigned offset, unsigned nblocks, unsigned stride)
+/* SHADER RESOURCE EG/CM */
+static int evergreen_resource_range_init(struct r600_context *ctx, struct r600_range *range, unsigned offset, unsigned nblocks, unsigned stride)
 {
 	struct r600_reg r600_shader_resource[] = {
 		{R_030000_RESOURCE0_WORD0, REG_FLAG_NEED_BO, 0},
@@ -764,13 +764,13 @@ int evergreen_context_init(struct r600_context *ctx)
 	ctx->num_ps_resources = 176;
 	ctx->num_vs_resources = 160;
 	ctx->num_fs_resources = 16;
-	r = r600_resource_range_init(ctx, &ctx->ps_resources, 0, 176, 0x20);
+	r = evergreen_resource_range_init(ctx, &ctx->ps_resources, 0, 176, 0x20);
 	if (r)
 		goto out_err;
-	r = r600_resource_range_init(ctx, &ctx->vs_resources, 0x1600, 160, 0x20);
+	r = evergreen_resource_range_init(ctx, &ctx->vs_resources, 0x1600, 160, 0x20);
 	if (r)
 		goto out_err;
-	r = r600_resource_range_init(ctx, &ctx->fs_resources, 0x7C00, 16, 0x20);
+	r = evergreen_resource_range_init(ctx, &ctx->fs_resources, 0x7C00, 16, 0x20);
 	if (r)
 		goto out_err;