Mesa (master): i915g: don't set alpha to 1 for RGBX and BGRX

[Daniel Vetter]

Module: Mesa
Branch: master
Commit: 8265bb7fb87184104e3c97dbf480170fb69ff8ad
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8265bb7fb87184104e3c97dbf480170fb69ff8ad

Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Wed Nov 23 13:27:24 2011 +0300

i915g: don't set alpha to 1 for RGBX and BGRX

This patch fixes regression introduced in
1f3c5eae5c4be582e50c2d4d7950424d86059c45

Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

---

 src/gallium/drivers/i915/i915_state_static.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_state_static.c b/src/gallium/drivers/i915/i915_state_static.c
index 64b842a..f41c32e 100644
--- a/src/gallium/drivers/i915/i915_state_static.c
+++ b/src/gallium/drivers/i915/i915_state_static.c
@@ -169,8 +169,7 @@ static const struct
    uint hw_swizzle;
 } fixup_formats[] = {
    { PIPE_FORMAT_R8G8B8A8_UNORM, 0x21030000 /* BGRA */},
-   { PIPE_FORMAT_B8G8R8X8_UNORM, 0x01250000 /* RGBX */},
-   { PIPE_FORMAT_R8G8B8X8_UNORM, 0x21050000 /* BGRX */},
+   { PIPE_FORMAT_R8G8B8X8_UNORM, 0x21030000 /* BGRX */},
    { PIPE_FORMAT_L8_UNORM,       0x00030000 /* RRRA */},
    { PIPE_FORMAT_I8_UNORM,       0x00030000 /* RRRA */},
    { PIPE_FORMAT_A8_UNORM,       0x33330000 /* AAAA */},