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/state_tracker | |
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/state_tracker')
-rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index d6e3a3e5610..e1d6fa9ecad 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -208,7 +208,7 @@ update_samplers(struct st_context *st) assert(sampler->min_lod <= sampler->max_lod); } - xlate_border_color(texobj->BorderColor, + xlate_border_color(texobj->BorderColor.f, teximg ? teximg->_BaseFormat : GL_RGBA, sampler->border_color); |