Mesa (master): r600: set border color as RGBA

Andre Maasikas andrem at kemper.freedesktop.org
Tue Jan 18 14:31:30 UTC 2011


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

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Tue Jan 18 16:04:43 2011 +0200

r600: set border color as RGBA

border color is RGBA for samples - this passes texenv tests

---

 src/mesa/drivers/dri/r600/r600_tex.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_tex.c b/src/mesa/drivers/dri/r600/r600_tex.c
index 2a99ded..fe4f0e4 100644
--- a/src/mesa/drivers/dri/r600/r600_tex.c
+++ b/src/mesa/drivers/dri/r600/r600_tex.c
@@ -265,9 +265,9 @@ static void r600SetTexFilter(radeonTexObjPtr t, GLenum minf, GLenum magf, GLfloa
 static void r600SetTexBorderColor(radeonTexObjPtr t, const GLfloat color[4])
 {
 	t->TD_PS_SAMPLER0_BORDER_ALPHA = *((uint32_t*)&(color[3]));
-	t->TD_PS_SAMPLER0_BORDER_RED = *((uint32_t*)&(color[2]));
+	t->TD_PS_SAMPLER0_BORDER_BLUE = *((uint32_t*)&(color[2]));
 	t->TD_PS_SAMPLER0_BORDER_GREEN = *((uint32_t*)&(color[1]));
-	t->TD_PS_SAMPLER0_BORDER_BLUE = *((uint32_t*)&(color[0]));
+	t->TD_PS_SAMPLER0_BORDER_RED = *((uint32_t*)&(color[0]));
         SETfield(t->SQ_TEX_SAMPLER0, SQ_TEX_BORDER_COLOR_REGISTER,
 		 BORDER_COLOR_TYPE_shift, BORDER_COLOR_TYPE_mask);
 }




More information about the mesa-commit mailing list