diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-28 15:25:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-28 15:25:22 +0200 |
| commit | c958cf29a8265091c4f68bb842a1d07c47e181fa (patch) | |
| tree | 9cdba0da6a601cd16a9c34c544c51be1aa7075fc /mesalib/src/mesa/state_tracker/st_atom_sampler.c | |
| parent | 756ccf7af09d35176962e44587244580c2cd0f22 (diff) | |
| parent | 18a8f9f6839dfd899814a76a971e720c1e622236 (diff) | |
| download | vcxsrv-c958cf29a8265091c4f68bb842a1d07c47e181fa.tar.gz vcxsrv-c958cf29a8265091c4f68bb842a1d07c47e181fa.tar.bz2 vcxsrv-c958cf29a8265091c4f68bb842a1d07c47e181fa.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_sampler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c index 731338f9b..ad159c64d 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c +++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c @@ -176,7 +176,7 @@ convert_sampler(struct st_context *st, st_translate_color(msamp->BorderColor.f, teximg ? teximg->_BaseFormat : GL_RGBA, - sampler->border_color); + sampler->border_color.f); } sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ? |