OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04f335f
)
Fix build errors from merge
author
Alex Deucher
<alexdeucher@gmail.com>
Fri, 10 Apr 2009 21:36:31 +0000
(17:36 -0400)
committer
Alex Deucher
<alexdeucher@gmail.com>
Fri, 10 Apr 2009 21:36:31 +0000
(17:36 -0400)
src/mesa/drivers/dri/r600/r600_tex.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/r600/r600_tex.c
b/src/mesa/drivers/dri/r600/r600_tex.c
index
39c1760
..
a057e03
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;
}