Mesa (r6xx-rewrite): Fix build errors from merge

[Alex Deucher]

Module: Mesa
Branch: r6xx-rewrite
Commit: 9b162cdda725f7e528bdf65290f508434a9dd51b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b162cdda725f7e528bdf65290f508434a9dd51b

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Apr 10 17:36:31 2009 -0400

Fix build errors from merge

---

 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 39c1760..a057e03 100644
--- a/src/mesa/drivers/dri/r600/r600_tex.c
+++ b/src/mesa/drivers/dri/r600/r600_tex.c
@@ -211,7 +211,7 @@ static void r600TexParameter(GLcontext * ctx, GLenum target,
 		break;
 
 	case GL_TEXTURE_BORDER_COLOR:
-		r600SetTexBorderColor(t, texObj->_BorderChan);
+		r600SetTexBorderColor(t, texObj->BorderColor);
 		break;
 
 	case GL_TEXTURE_BASE_LEVEL:
@@ -308,7 +308,7 @@ static struct gl_texture_object *r600NewTextureObject(GLcontext * ctx,
 	/* Initialize hardware state */
 	r600UpdateTexWrap(t);
 	r600SetTexFilter(t, t->base.MinFilter, t->base.MagFilter, t->base.MaxAnisotropy);
-	r600SetTexBorderColor(t, t->base._BorderChan);
+	r600SetTexBorderColor(t, t->base.BorderColor);
 
 	return &t->base;
 }