summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/i915/i915_state.c
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/gallium/drivers/i915/i915_state.c
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/gallium/drivers/i915/i915_state.c')
-rw-r--r--src/gallium/drivers/i915/i915_state.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index 2812de1fe80..345c109a995 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -279,10 +279,10 @@ i915_create_sampler_state(struct pipe_context *pipe,
}
{
- ubyte r = float_to_ubyte(sampler->border_color[0]);
- ubyte g = float_to_ubyte(sampler->border_color[1]);
- ubyte b = float_to_ubyte(sampler->border_color[2]);
- ubyte a = float_to_ubyte(sampler->border_color[3]);
+ ubyte r = float_to_ubyte(sampler->border_color.f[0]);
+ ubyte g = float_to_ubyte(sampler->border_color.f[1]);
+ ubyte b = float_to_ubyte(sampler->border_color.f[2]);
+ ubyte a = float_to_ubyte(sampler->border_color.f[3]);
cso->state[2] = I915PACKCOLOR8888(r, g, b, a);
}
return cso;