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

Author: Michel Dänzer <daen...@vmware.com>
Date:   Mon Nov 16 11:59:39 2009 +0100

st/xorg: Only reference new picture formats when they're defined.

Fixes http://bugs.freedesktop.org/show_bug.cgi/?id=25094 .

---

 src/gallium/state_trackers/xorg/xorg_exa.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c 
b/src/gallium/state_trackers/xorg/xorg_exa.c
index a77ee7a..735cabf 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -57,16 +57,18 @@ struct render_format_str {
 };
 static const struct render_format_str formats_info[] =
 {
-   {PICT_a2r10g10b10, "PICT_a2r10g10b10"},
-   {PICT_x2r10g10b10, "PICT_x2r10g10b10"},
-   {PICT_a2b10g10r10, "PICT_a2b10g10r10"},
-   {PICT_x2b10g10r10, "PICT_x2b10g10r10"},
    {PICT_a8r8g8b8, "PICT_a8r8g8b8"},
    {PICT_x8r8g8b8, "PICT_x8r8g8b8"},
    {PICT_a8b8g8r8, "PICT_a8b8g8r8"},
    {PICT_x8b8g8r8, "PICT_x8b8g8r8"},
+#ifdef PICT_TYPE_BGRA
    {PICT_b8g8r8a8, "PICT_b8g8r8a8"},
    {PICT_b8g8r8x8, "PICT_b8g8r8x8"},
+   {PICT_a2r10g10b10, "PICT_a2r10g10b10"},
+   {PICT_x2r10g10b10, "PICT_x2r10g10b10"},
+   {PICT_a2b10g10r10, "PICT_a2b10g10r10"},
+   {PICT_x2b10g10r10, "PICT_x2b10g10r10"},
+#endif
    {PICT_r8g8b8, "PICT_r8g8b8"},
    {PICT_b8g8r8, "PICT_b8g8r8"},
    {PICT_r5g6b5, "PICT_r5g6b5"},

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to