summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/svga/svga_pipe_sampler.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-09-27 10:08:34 +0100
committerDave Airlie <airlied@redhat.com>2011-09-27 20:02:02 +0100
commit9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf (patch)
tree8985ff4b3c47899deb7604511ac168fa76e46f63 /src/gallium/drivers/svga/svga_pipe_sampler.c
parent0527c11d7aa42bd74f4527d7299e3c18f37c4c44 (diff)
downloadexternal_mesa3d-9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf.zip
external_mesa3d-9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf.tar.gz
external_mesa3d-9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf.tar.bz2
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 <airlied@redhat.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/drivers/svga/svga_pipe_sampler.c')
-rw-r--r--src/gallium/drivers/svga/svga_pipe_sampler.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c
index dcfeaac..4885d20 100644
--- a/src/gallium/drivers/svga/svga_pipe_sampler.c
+++ b/src/gallium/drivers/svga/svga_pipe_sampler.c
@@ -113,10 +113,10 @@ svga_create_sampler_state(struct pipe_context *pipe,
cso->compare_func = sampler->compare_func;
{
- uint32 r = float_to_ubyte(sampler->border_color[0]);
- uint32 g = float_to_ubyte(sampler->border_color[1]);
- uint32 b = float_to_ubyte(sampler->border_color[2]);
- uint32 a = float_to_ubyte(sampler->border_color[3]);
+ uint32 r = float_to_ubyte(sampler->border_color.f[0]);
+ uint32 g = float_to_ubyte(sampler->border_color.f[1]);
+ uint32 b = float_to_ubyte(sampler->border_color.f[2]);
+ uint32 a = float_to_ubyte(sampler->border_color.f[3]);
cso->bordercolor = (a << 24) | (r << 16) | (g << 8) | b;
}