From patchwork Tue Mar 15 12:36:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 86976 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id 39FF4B700E for ; Tue, 15 Mar 2011 23:48:49 +1100 (EST) Received: from localhost ([127.0.0.1]:50848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzTZ6-00040A-Bo for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 08:41:32 -0400 Received: from [140.186.70.92] (port=44321 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzTUT-0001YU-VD for qemu-devel@nongnu.org; Tue, 15 Mar 2011 08:36:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzTUS-0006y3-Eq for qemu-devel@nongnu.org; Tue, 15 Mar 2011 08:36:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzTUS-0006xm-58 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 08:36:44 -0400 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 p2FCag05007344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Mar 2011 08:36:42 -0400 Received: from red-feather.redhat.com (ovpn-113-63.phx2.redhat.com [10.3.113.63]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2FCabh0010325; Tue, 15 Mar 2011 08:36:41 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2011 13:36:08 +0100 Message-Id: <1300192574-32644-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300192574-32644-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300192574-32644-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 1/7] Consolidate DisplaySurface allocation in qemu_alloc_display() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen This removes various code duplication from console.e and sdl.c Signed-off-by: Jes Sorensen --- console.c | 45 +++++++++++++++++++++++++-------------------- console.h | 3 +++ ui/sdl.c | 21 ++++++++------------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/console.c b/console.c index 57d6eb5..4939a72 100644 --- a/console.c +++ b/console.c @@ -1278,35 +1278,40 @@ static DisplaySurface* defaultallocator_create_displaysurface(int width, int hei { DisplaySurface *surface = (DisplaySurface*) qemu_mallocz(sizeof(DisplaySurface)); - surface->width = width; - surface->height = height; - surface->linesize = width * 4; - surface->pf = qemu_default_pixelformat(32); -#ifdef HOST_WORDS_BIGENDIAN - surface->flags = QEMU_ALLOCATED_FLAG | QEMU_BIG_ENDIAN_FLAG; -#else - surface->flags = QEMU_ALLOCATED_FLAG; -#endif - surface->data = (uint8_t*) qemu_mallocz(surface->linesize * surface->height); - + int linesize = width * 4; + surface = qemu_alloc_display(surface, width, height, linesize, + qemu_default_pixelformat(32), 0); return surface; } static DisplaySurface* defaultallocator_resize_displaysurface(DisplaySurface *surface, int width, int height) { + int linesize = width * 4; + surface = qemu_alloc_display(surface, width, height, linesize, + qemu_default_pixelformat(32), 0); + return surface; +} + +DisplaySurface* +qemu_alloc_display(DisplaySurface *surface, int width, int height, + int linesize, PixelFormat pf, int newflags) +{ + void *data; surface->width = width; surface->height = height; - surface->linesize = width * 4; - surface->pf = qemu_default_pixelformat(32); - if (surface->flags & QEMU_ALLOCATED_FLAG) - surface->data = (uint8_t*) qemu_realloc(surface->data, surface->linesize * surface->height); - else - surface->data = (uint8_t*) qemu_malloc(surface->linesize * surface->height); + surface->linesize = linesize; + surface->pf = pf; + if (surface->flags & QEMU_ALLOCATED_FLAG) { + data = qemu_realloc(surface->data, + surface->linesize * surface->height); + } else { + data = qemu_malloc(surface->linesize * surface->height); + } + surface->data = (uint8_t *)data; + surface->flags = newflags | QEMU_ALLOCATED_FLAG; #ifdef HOST_WORDS_BIGENDIAN - surface->flags = QEMU_ALLOCATED_FLAG | QEMU_BIG_ENDIAN_FLAG; -#else - surface->flags = QEMU_ALLOCATED_FLAG; + surface->flags |= QEMU_BIG_ENDIAN_FLAG; #endif return surface; diff --git a/console.h b/console.h index f4e4741..dec9a76 100644 --- a/console.h +++ b/console.h @@ -189,6 +189,9 @@ void register_displaystate(DisplayState *ds); DisplayState *get_displaystate(void); DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp, int linesize, uint8_t *data); +DisplaySurface* qemu_alloc_display(DisplaySurface *surface, int width, + int height, int linesize, + PixelFormat pf, int newflags); PixelFormat qemu_different_endianness_pixelformat(int bpp); PixelFormat qemu_default_pixelformat(int bpp); diff --git a/ui/sdl.c b/ui/sdl.c index 47ac49c..6c10ea6 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -176,23 +176,18 @@ static DisplaySurface* sdl_create_displaysurface(int width, int height) surface->width = width; surface->height = height; - + if (scaling_active) { + int linesize; + PixelFormat pf; if (host_format.BytesPerPixel != 2 && host_format.BytesPerPixel != 4) { - surface->linesize = width * 4; - surface->pf = qemu_default_pixelformat(32); + linesize = width * 4; + pf = qemu_default_pixelformat(32); } else { - surface->linesize = width * host_format.BytesPerPixel; - surface->pf = sdl_to_qemu_pixelformat(&host_format); + linesize = width * host_format.BytesPerPixel; + pf = sdl_to_qemu_pixelformat(&host_format); } -#ifdef HOST_WORDS_BIGENDIAN - surface->flags = QEMU_ALLOCATED_FLAG | QEMU_BIG_ENDIAN_FLAG; -#else - surface->flags = QEMU_ALLOCATED_FLAG; -#endif - surface->data = (uint8_t*) qemu_mallocz(surface->linesize * surface->height); - - return surface; + return qemu_alloc_display(surface, width, height, linesize, pf, 0); } if (host_format.BitsPerPixel == 16)