commit bf9b48af99a75a1f7d76c8b3d92a82a0a41cb707
author aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Mar 28 17:28:53 2009 +0000
committer aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Mar 28 17:28:53 2009 +0000
tree f44e8c8e1e2c1c88fd4733cff72a0aac78c460aa
parent 0fe17f5efb2f60393efb9ad9038aae4d056111ff

musicpal: Fix regression caused by 6839 (Jan Kiszka)

Pass correct DisplayState field to is_surface_bgr().

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6898 c046a42c-6fe2-441c-8c8c-71466251a162

hw/musicpal.c

diff --git a/hw/musicpal.c b/hw/musicpal.c
index abd3afa..8eb1316 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -831,7 +831,8 @@
         break;
     LCD_REFRESH(8, rgb_to_pixel8)
     LCD_REFRESH(16, rgb_to_pixel16)
-    LCD_REFRESH(32, (is_surface_bgr(s->ds) ? rgb_to_pixel32bgr : rgb_to_pixel32))
+    LCD_REFRESH(32, (is_surface_bgr(s->ds->surface) ?
+                     rgb_to_pixel32bgr : rgb_to_pixel32))
     default:
         cpu_abort(cpu_single_env, "unsupported colour depth %i\n",
                   ds_get_bits_per_pixel(s->ds));