summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2011-09-27 10:08:34 +0100
committerDave Airlie <[email protected]>2011-09-27 20:02:02 +0100
commit9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf (patch)
tree8985ff4b3c47899deb7604511ac168fa76e46f63 /src/mesa
parent0527c11d7aa42bd74f4527d7299e3c18f37c4c44 (diff)
gallium: move border color to be a color union
EXT_texture_integer also specifies border color should be a color union, the values are used according to the texture sampler format. (update docs) Signed-off-by: Dave Airlie <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_atom_sampler.c2
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 731338f9beb..ad159c64dc1 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/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 ?