From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSqZY-00039y-Sk for qemu-devel@nongnu.org; Tue, 03 Mar 2015 12:25:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSqZW-0005HD-4Z for qemu-devel@nongnu.org; Tue, 03 Mar 2015 12:25:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSqZV-0005H6-SN for qemu-devel@nongnu.org; Tue, 03 Mar 2015 12:25:30 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t23HPTiL022758 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 3 Mar 2015 12:25:29 -0500 From: Max Reitz Date: Tue, 3 Mar 2015 12:25:27 -0500 Message-Id: <1425403527-4876-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH] sdl2: Fix RGB555 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Max Reitz Reproducable with: $ x86_64-softmmu/qemu-system-x86_64 \ -kernel $vmlinuz_of_your_choice \ -append vga=0x313 -sdl Signed-off-by: Max Reitz --- include/ui/console.h | 5 +++++ ui/sdl2-2d.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 0f97d86..1193728 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -272,6 +272,11 @@ static inline int surface_bytes_per_pixel(DisplaySurface *s) return (bits + 7) / 8; } +static inline pixman_format_code_t surface_format(DisplaySurface *s) +{ + return s->format; +} + #ifdef CONFIG_CURSES #include typedef chtype console_ch_t; diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index f907c21..d279d53 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -91,10 +91,21 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, surface_width(new_surface), surface_height(new_surface)); - if (surface_bits_per_pixel(scon->surface) == 16) { + switch (surface_format(scon->surface)) { + case PIXMAN_x1r5g5b5: + format = SDL_PIXELFORMAT_ARGB1555; + break; + case PIXMAN_r5g6b5: format = SDL_PIXELFORMAT_RGB565; - } else if (surface_bits_per_pixel(scon->surface) == 32) { + break; + case PIXMAN_x8r8g8b8: format = SDL_PIXELFORMAT_ARGB8888; + break; + case PIXMAN_r8g8b8x8: + format = SDL_PIXELFORMAT_RGBA8888; + break; + default: + g_assert_not_reached(); } scon->texture = SDL_CreateTexture(scon->real_renderer, format, SDL_TEXTUREACCESS_STREAMING, -- 2.1.0