Mesa (master): evergreeng: avoid overlapping border color btw VS & PS

[Jerome Glisse]

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

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Thu Sep 30 17:06:29 2010 -0400

evergreeng: avoid overlapping border color btw VS & PS

Signed-off-by: Jerome Glisse <jglisse at redhat.com>

---

 src/gallium/winsys/r600/drm/evergreen_hw_context.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
index 7ba778e..7d6bd50 100644
--- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c
+++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
@@ -467,7 +467,7 @@ static int evergreen_state_sampler_border_init(struct r600_context *ctx, u32 off
 		{PKT3_SET_CONFIG_REG, 0, R_00A410_TD_PS_SAMPLER0_BORDER_ALPHA, 0, 0},
 	};
 	unsigned nreg = sizeof(r600_shader_sampler_border)/sizeof(struct r600_reg);
-	unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x10 + 0x40000 + id * 0x1C;
+	unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x100 + 0x40000 + id * 0x1C;
 	struct r600_range *range;
 	struct r600_block *block;
 	int r;
@@ -665,7 +665,7 @@ static inline void evergreen_context_pipe_state_set_sampler(struct r600_context
 
 static inline void evergreen_context_pipe_state_set_sampler_border(struct r600_context *ctx, struct r600_pipe_state *state, unsigned offset, unsigned id)
 {
-	unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x10 + 0x40000 + id * 0x1C;
+	unsigned fake_offset = (offset - R_00A400_TD_PS_SAMPLER0_BORDER_INDEX) * 0x100 + 0x40000 + id * 0x1C;
 	struct r600_range *range;
 	struct r600_block *block;