i915g: don't set alpha to 1 for RGBX and BGRX
authorVasily Khoruzhick <anarsoul@gmail.com>
Wed, 23 Nov 2011 10:27:24 +0000 (13:27 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 23 Nov 2011 10:32:13 +0000 (11:32 +0100)
This patch fixes regression introduced in
1f3c5eae5c4be582e50c2d4d7950424d86059c45

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
src/gallium/drivers/i915/i915_state_static.c

index 64b842a9f76d4d997a3359abbdd6051cecd746db..f41c32eaeabd8aba2b572a6b936cfbe9791833ba 100644 (file)
@@ -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 */},