From: notaz <notasas@gmail.com>
Date: Sat, 10 Sep 2022 13:57:39 +0000 (+0300)
Subject: Merge branch 'irixxxx'
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7167e5f3376f0d0692ae102ed2df1ef5d2cc199a;hp=-c;p=libpicofe.git

Merge branch 'irixxxx'
---

7167e5f3376f0d0692ae102ed2df1ef5d2cc199a
diff --combined plat_sdl.c
index 97e2d29,6a86d1d..530a9d7
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@@ -101,13 -101,11 +101,13 @@@ int plat_sdl_change_video_mode(int w, i
        || plat_target.vout_method == vout_mode_overlay2x) {
      int W = plat_target.vout_method == vout_mode_overlay2x && w == 320 ? 2*w : w;
      plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
 -    if (plat_sdl_overlay != NULL) {
 +    if (plat_sdl_overlay != NULL && SDL_LockYUVOverlay(plat_sdl_overlay) == 0) {
        if ((long)plat_sdl_overlay->pixels[0] & 3)
          fprintf(stderr, "warning: overlay pointer is unaligned\n");
  
        plat_sdl_overlay_clear();
 +
 +      SDL_UnlockYUVOverlay(plat_sdl_overlay);
      }
      else {
        fprintf(stderr, "warning: could not create overlay.\n");
@@@ -125,7 -123,9 +125,9 @@@
    if (plat_target.vout_method == 0) {
      SDL_PumpEvents();
  
- #if defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
+ #if defined SDL_SURFACE_SW
+     plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_SWSURFACE);
+ #elif defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
      plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_TRIPLEBUF);
  #else
      plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_DOUBLEBUF);