summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r600
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2009-04-10 17:36:31 -0400
committerAlex Deucher <[email protected]>2009-04-10 17:36:31 -0400
commit9b162cdda725f7e528bdf65290f508434a9dd51b (patch)
treedd28df3fadf72b95ca008d6efc2e109b6c2f72f1 /src/mesa/drivers/dri/r600
parent04f335fd16c2a13b9425797acf5c3989cb6def7f (diff)
Fix build errors from merge
Diffstat (limited to 'src/mesa/drivers/dri/r600')
-rw-r--r--src/mesa/drivers/dri/r600/r600_tex.c4
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 39c1760c62e..a057e039f21 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;
}