diff options
author | Brian Paul <brianp@vmware.com> | 2010-01-04 19:53:28 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-01-04 19:53:30 -0700 |
commit | f6c2d1f94ffa8f87b22ed1ff5c465d0e9aa1489e (patch) | |
tree | 3a0902a4971600e20320fdc35da21f000da820f6 /src/mesa/main/texobj.c | |
parent | 32b9983c0a593c0b50a44ddae829dee820cfd448 (diff) | |
download | external_mesa3d-f6c2d1f94ffa8f87b22ed1ff5c465d0e9aa1489e.zip external_mesa3d-f6c2d1f94ffa8f87b22ed1ff5c465d0e9aa1489e.tar.gz external_mesa3d-f6c2d1f94ffa8f87b22ed1ff5c465d0e9aa1489e.tar.bz2 |
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/texobj.c')
-rw-r--r-- | src/mesa/main/texobj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 09fe7b8..7f0a246 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -228,10 +228,10 @@ _mesa_copy_texture_object( struct gl_texture_object *dest, dest->Target = src->Target; dest->Name = src->Name; dest->Priority = src->Priority; - dest->BorderColor[0] = src->BorderColor[0]; - dest->BorderColor[1] = src->BorderColor[1]; - dest->BorderColor[2] = src->BorderColor[2]; - dest->BorderColor[3] = src->BorderColor[3]; + dest->BorderColor.f[0] = src->BorderColor.f[0]; + dest->BorderColor.f[1] = src->BorderColor.f[1]; + dest->BorderColor.f[2] = src->BorderColor.f[2]; + dest->BorderColor.f[3] = src->BorderColor.f[3]; dest->WrapS = src->WrapS; dest->WrapT = src->WrapT; dest->WrapR = src->WrapR; |