diff options
| author | Dave Airlie <[email protected]> | 2011-09-27 10:08:34 +0100 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-09-27 20:02:02 +0100 |
| commit | 9f61e43b4903c6cf0ac03a479ec9ed7b15fd6ccf (patch) | |
| tree | 8985ff4b3c47899deb7604511ac168fa76e46f63 /src/gallium/drivers/nv50/nv50_state.c | |
| parent | 0527c11d7aa42bd74f4527d7299e3c18f37c4c44 (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/gallium/drivers/nv50/nv50_state.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c index 49ea646c77c..0e08b096f58 100644 --- a/src/gallium/drivers/nv50/nv50_state.c +++ b/src/gallium/drivers/nv50/nv50_state.c @@ -508,10 +508,10 @@ nv50_sampler_state_create(struct pipe_context *pipe, so->tsc[2] |= (((int)(f[1] * 256.0f) & 0xfff) << 12) | ((int)(f[0] * 256.0f) & 0xfff); - so->tsc[4] = fui(cso->border_color[0]); - so->tsc[5] = fui(cso->border_color[1]); - so->tsc[6] = fui(cso->border_color[2]); - so->tsc[7] = fui(cso->border_color[3]); + so->tsc[4] = fui(cso->border_color.f[0]); + so->tsc[5] = fui(cso->border_color.f[1]); + so->tsc[6] = fui(cso->border_color.f[2]); + so->tsc[7] = fui(cso->border_color.f[3]); return (void *)so; } |