Re: [Qemu-devel] [PATCH 05/10] sdl2: move sdl_update to new sdl2-2d.c

[Max Reitz <mreitz@redhat.com>]

On 2014-12-11 at 11:49, Gerd Hoffmann wrote:
> Create new sdl2-2d file for 2d display rendering.
> Move over sdl_update code, and rename to sdl2_2d_update.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>   include/ui/sdl2.h |  3 +++
>   ui/Makefile.objs  |  2 +-
>   ui/sdl2-2d.c      | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>   ui/sdl2.c         | 35 +++++--------------------------
>   4 files changed, 70 insertions(+), 31 deletions(-)
>   create mode 100644 ui/sdl2-2d.c
>
> diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
> index e1c304a..0573e2a 100644
> --- a/include/ui/sdl2.h
> +++ b/include/ui/sdl2.h
> @@ -13,3 +13,6 @@ struct sdl2_console {
>   void sdl2_reset_keys(struct sdl2_console *scon);
>   void sdl2_process_key(struct sdl2_console *scon,
>                         SDL_KeyboardEvent *ev);
> +
> +void sdl2_2d_update(DisplayChangeListener *dcl,
> +                    int x, int y, int w, int h);
> diff --git a/ui/Makefile.objs b/ui/Makefile.objs
> index 011c5bb..13b5cfb 100644
> --- a/ui/Makefile.objs
> +++ b/ui/Makefile.objs
> @@ -20,7 +20,7 @@ ifeq ($(CONFIG_SDLABI),1.2)
>   sdl.mo-objs := sdl.o sdl_zoom.o
>   endif
>   ifeq ($(CONFIG_SDLABI),2.0)
> -sdl.mo-objs := sdl2.o sdl2-input.o
> +sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o
>   endif
>   sdl.mo-cflags := $(SDL_CFLAGS)
>   
> diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
> new file mode 100644
> index 0000000..7b0039b
> --- /dev/null
> +++ b/ui/sdl2-2d.c
> @@ -0,0 +1,61 @@
> +/*
> + * QEMU SDL display driver
> + *
> + * Copyright (c) 2003 Fabrice Bellard
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
> +
> +/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
> +#undef WIN32_LEAN_AND_MEAN
> +
> +#include <SDL.h>
> +#include <SDL_syswm.h>
> +
> +#include "qemu-common.h"
> +#include "ui/console.h"
> +#include "ui/input.h"
> +#include "ui/sdl2.h"
> +#include "sysemu/sysemu.h"
> +
> +void sdl2_2d_update(DisplayChangeListener *dcl,
> +                    int x, int y, int w, int h)
> +{
> +    struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
> +    DisplaySurface *surf = qemu_console_surface(dcl->con);
> +    SDL_Rect rect;
> +
> +    if (!surf) {
> +        return;
> +    }
> +    if (!scon->texture) {
> +        return;
> +    }
> +
> +    rect.x = x;
> +    rect.y = y;
> +    rect.w = w;
> +    rect.h = h;
> +
> +    SDL_UpdateTexture(scon->texture, NULL, surface_data(surf),
> +                      surface_stride(surf));

Hm, I'm wondering whether this could be optimized by passing &rect 
instead of NULL and calculating the start address from 
surface_data(surf) and rect...

Anyway:

Reviewed-by: Max Reitz <mreitz@redhat.com>