aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_atom_sampler.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-28 15:18:21 +0200
committermarha <marha@users.sourceforge.net>2011-09-28 15:18:21 +0200
commit18a8f9f6839dfd899814a76a971e720c1e622236 (patch)
tree42ad3d70bcbefe8f2c218468f7a1fd033b38428c /mesalib/src/mesa/state_tracker/st_atom_sampler.c
parent183b7373f9919eeb5eb408f38578e01717b2cc10 (diff)
downloadvcxsrv-18a8f9f6839dfd899814a76a971e720c1e622236.tar.gz
vcxsrv-18a8f9f6839dfd899814a76a971e720c1e622236.tar.bz2
vcxsrv-18a8f9f6839dfd899814a76a971e720c1e622236.zip
mesa pixman xkeyboard-config git update 28 sep 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_sampler.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_atom_sampler.c2
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 ?