diff options
| author | Brian Paul <[email protected]> | 2010-01-04 19:53:28 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-04 19:53:30 -0700 |
| commit | f6c2d1f94ffa8f87b22ed1ff5c465d0e9aa1489e (patch) | |
| tree | 3a0902a4971600e20320fdc35da21f000da820f6 /src/mesa/drivers/dri/r600/r600_tex.c | |
| parent | 32b9983c0a593c0b50a44ddae829dee820cfd448 (diff) | |
mesa: make texture BorderColor a union of float/int/uint
When we have integer-valued texture formats, the texture border color
must also store integer and uint values.
With GL 3.0, the new glTexParameterIiv() and glTexParameterIuiv() functions
can set the border color to int or uint values.
Diffstat (limited to 'src/mesa/drivers/dri/r600/r600_tex.c')
| -rw-r--r-- | 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 9d83a64e220..f745fe3e8a6 100644 --- a/src/mesa/drivers/dri/r600/r600_tex.c +++ b/src/mesa/drivers/dri/r600/r600_tex.c @@ -305,7 +305,7 @@ static void r600TexParameter(GLcontext * ctx, GLenum target, break; case GL_TEXTURE_BORDER_COLOR: - r600SetTexBorderColor(t, texObj->BorderColor); + r600SetTexBorderColor(t, texObj->BorderColor.f); break; case GL_TEXTURE_BASE_LEVEL: @@ -391,7 +391,7 @@ static struct gl_texture_object *r600NewTextureObject(GLcontext * ctx, r600SetTexDefaultState(t); r600UpdateTexWrap(t); r600SetTexFilter(t, t->base.MinFilter, t->base.MagFilter, t->base.MaxAnisotropy); - r600SetTexBorderColor(t, t->base.BorderColor); + r600SetTexBorderColor(t, t->base.BorderColor.f); return &t->base; } |