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/main/attrib.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/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index fb15a5ba478..0641b98b3b7 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -835,7 +835,7 @@ pop_texture_group(GLcontext *ctx, struct texture_state *texstate) _mesa_BindTexture(target, obj->Name); - _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor); + _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor.f); _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority); _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS); _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT); |