From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3ZQE-0004iz-IW for qemu-devel@nongnu.org; Fri, 21 Nov 2008 12:03:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3ZQD-0004ic-SY for qemu-devel@nongnu.org; Fri, 21 Nov 2008 12:03:58 -0500 Received: from [199.232.76.173] (port=46049 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3ZQD-0004iU-NP for qemu-devel@nongnu.org; Fri, 21 Nov 2008 12:03:57 -0500 Received: from smtp.eu.citrix.com ([62.200.22.115]:7801) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L3ZQD-0005YJ-JB for qemu-devel@nongnu.org; Fri, 21 Nov 2008 12:03:57 -0500 Message-ID: <4926EADE.9020303@eu.citrix.com> Date: Fri, 21 Nov 2008 17:07:42 +0000 From: Stefano Stabellini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 3 of 5] [UPDATE] remove bgr Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Do not handle bgr host displays in the backends. Signed-off-by: Stefano Stabellini diff -r a70f40b01c8f hw/musicpal.c --- a/hw/musicpal.c Fri Nov 21 14:36:45 2008 +0000 +++ b/hw/musicpal.c Fri Nov 21 14:40:10 2008 +0000 @@ -835,7 +835,7 @@ break; LCD_REFRESH(8, rgb_to_pixel8) LCD_REFRESH(16, rgb_to_pixel16) - LCD_REFRESH(32, (s->ds->bgr ? rgb_to_pixel32bgr : rgb_to_pixel32)) + LCD_REFRESH(32, rgb_to_pixel32) default: cpu_abort(cpu_single_env, "unsupported colour depth %i\n", ds_get_bits_per_pixel(s->ds)); diff -r a70f40b01c8f hw/tcx.c --- a/hw/tcx.c Fri Nov 21 14:36:45 2008 +0000 +++ b/hw/tcx.c Fri Nov 21 14:40:10 2008 +0000 @@ -61,22 +61,13 @@ s->palette[i] = rgb_to_pixel8(s->r[i], s->g[i], s->b[i]); break; case 15: - if (s->ds->bgr) - s->palette[i] = rgb_to_pixel15bgr(s->r[i], s->g[i], s->b[i]); - else - s->palette[i] = rgb_to_pixel15(s->r[i], s->g[i], s->b[i]); + s->palette[i] = rgb_to_pixel15(s->r[i], s->g[i], s->b[i]); break; case 16: - if (s->ds->bgr) - s->palette[i] = rgb_to_pixel16bgr(s->r[i], s->g[i], s->b[i]); - else - s->palette[i] = rgb_to_pixel16(s->r[i], s->g[i], s->b[i]); + s->palette[i] = rgb_to_pixel16(s->r[i], s->g[i], s->b[i]); break; case 32: - if (s->ds->bgr) - s->palette[i] = rgb_to_pixel32bgr(s->r[i], s->g[i], s->b[i]); - else - s->palette[i] = rgb_to_pixel32(s->r[i], s->g[i], s->b[i]); + s->palette[i] = rgb_to_pixel32(s->r[i], s->g[i], s->b[i]); break; } } @@ -134,12 +125,11 @@ const uint32_t *cplane, const uint32_t *s24) { - int x, bgr, r, g, b; + int x, r, g, b; uint8_t val, *p8; uint32_t *p = (uint32_t *)d; uint32_t dval; - bgr = s1->ds->bgr; for(x = 0; x < width; x++, s++, s24++) { if ((be32_to_cpu(*cplane++) & 0xff000000) == 0x03000000) { // 24-bit direct, BGR order @@ -148,10 +138,7 @@ b = *p8++; g = *p8++; r = *p8++; - if (bgr) - dval = rgb_to_pixel32bgr(r, g, b); - else - dval = rgb_to_pixel32(r, g, b); + dval = rgb_to_pixel32(r, g, b); } else { val = *s; dval = s1->palette[val]; diff -r a70f40b01c8f hw/vga.c --- a/hw/vga.c Fri Nov 21 14:36:45 2008 +0000 +++ b/hw/vga.c Fri Nov 21 14:40:10 2008 +0000 @@ -1156,20 +1156,11 @@ case 8: return 0; case 15: - if (s->bgr) - return 5; - else - return 1; + return 1; case 16: - if (s->bgr) - return 6; - else - return 2; + return 2; case 32: - if (s->bgr) - return 4; - else - return 3; + return 3; } } diff -r a70f40b01c8f sdl.c --- a/sdl.c Fri Nov 21 14:36:45 2008 +0000 +++ b/sdl.c Fri Nov 21 14:40:10 2008 +0000 @@ -99,11 +99,6 @@ mask |= screen->format->Bmask; if ((mask & 0x8000) == 0) ds->depth = 15; - } - if (ds->depth == 32 && screen->format->Rshift == 0) { - ds->bgr = 1; - } else { - ds->bgr = 0; } ds->width = w; ds->height = h;