Fix build errors from merge

diff --git a/src/mesa/drivers/dri/r600/r600_tex.c b/src/mesa/drivers/dri/r600/r600_tex.c
index 39c1760c62e646020be146d30d178fc087b7f885..a057e039f21ec3868f88f5484d78e747cfb18e41 100644 (file)
--- 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;
 }