From fa4082320acaf0a1a22ae56144eef94b2997818d Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Wed, 23 Apr 2014 20:00:03 +0200 Subject: gallium/util: use ui[4] instead of ui in union util_color util_color often merely represents a collection of bytes, however it is inconvenient if those bytes can only be accessed as floats/doubles for int formats exceeding 32bits. (Note that since rgba8 formats use one uint, not 4 bytes, hence the byte and short member were left as is.) --- src/gallium/drivers/i915/i915_clear.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/i915/i915_clear.c') diff --git a/src/gallium/drivers/i915/i915_clear.c b/src/gallium/drivers/i915/i915_clear.c index b17707f3f64..57244a65bb5 100644 --- a/src/gallium/drivers/i915/i915_clear.c +++ b/src/gallium/drivers/i915/i915_clear.c @@ -66,10 +66,10 @@ i915_clear_emit(struct pipe_context *pipe, unsigned buffers, util_pack_color(color->f, cbuf->format, &u_color); if (util_format_get_blocksize(cbuf_tex->b.b.format) == 4) { - clear_color = u_color.ui; + clear_color = u_color.ui[0]; color_clear_bbp = 32; } else { - clear_color = (u_color.ui & 0xffff) | (u_color.ui << 16); + clear_color = (u_color.ui[0] & 0xffff) | (u_color.ui[0] << 16); color_clear_bbp = 16; } @@ -78,7 +78,7 @@ i915_clear_emit(struct pipe_context *pipe, unsigned buffers, util_pack_color(color->f, cbuf->format, &u_color); else util_pack_color(color->f, PIPE_FORMAT_B8G8R8A8_UNORM, &u_color); - clear_color8888 = u_color.ui; + clear_color8888 = u_color.ui[0]; } else clear_color = clear_color8888 = 0; -- cgit v1.2.3