X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=plat_sdl.c;h=9b78d056785fc180009f0c287f65eb1516dfdaf3;hb=HEAD;hp=7f416389f8099996df156c04aebb0045bed51ee3;hpb=bededcb4be20a22ec63d8fa6a77de093d9fc9fa7;p=libpicofe.git

diff --git a/plat_sdl.c b/plat_sdl.c
index 7f41638..031e162 100644
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <SDL.h>
 #include <SDL_syswm.h>
 
@@ -26,15 +27,51 @@ SDL_Overlay *plat_sdl_overlay;
 int plat_sdl_gl_active;
 void (*plat_sdl_resize_cb)(int w, int h);
 void (*plat_sdl_quit_cb)(void);
+int plat_sdl_no_overlay2x;
 
 static char vid_drv_name[32];
 static int window_w, window_h, window_b;
 static int fs_w, fs_h;
 static int old_fullscreen;
-static int screen_flags;
 static int vout_mode_overlay = -1, vout_mode_overlay2x = -1, vout_mode_gl = -1;
 static void *display, *window;
 static int gl_quirks;
+static Uint32 screen_flags =
+#if defined(SDL_SURFACE_SW)
+  SDL_SWSURFACE;
+#elif defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
+  SDL_HWSURFACE | SDL_TRIPLEBUF;
+#else
+  SDL_HWSURFACE | SDL_DOUBLEBUF;
+#endif
+
+static Uint32 get_screen_flags(void)
+{
+  Uint32 flags = screen_flags;
+  flags &= ~(SDL_FULLSCREEN | SDL_RESIZABLE);
+  if (plat_target.vout_fullscreen && fs_w && fs_h)
+    flags |= SDL_FULLSCREEN;
+  else if (window_b)
+    flags |= SDL_RESIZABLE;
+  return flags;
+}
+
+static void update_wm_display_window(void)
+{
+  // get x11 display/window for GL
+#ifdef SDL_VIDEO_DRIVER_X11
+  SDL_SysWMinfo wminfo;
+  int ret;
+  if (strcmp(vid_drv_name, "x11") == 0) {
+    SDL_VERSION(&wminfo.version);
+    ret = SDL_GetWMInfo(&wminfo);
+    if (ret > 0) {
+      display = wminfo.info.x11.display;
+      window = (void *)wminfo.info.x11.window;
+    }
+  }
+#endif
+}
 
 /* w, h is layer resolution */
 int plat_sdl_change_video_mode(int w, int h, int force)
@@ -73,44 +110,51 @@ int plat_sdl_change_video_mode(int w, int h, int force)
     plat_sdl_overlay = NULL;
   }
   if (plat_sdl_gl_active) {
-    gl_finish();
+    gl_destroy();
     plat_sdl_gl_active = 0;
   }
 
-  if (plat_target.vout_method != 0) {
-    Uint32 flags = SDL_RESIZABLE | SDL_SWSURFACE;
-    int win_w = window_w;
-    int win_h = window_h;
+  if (plat_target.vout_method == 0 || (force && (window_w != w || window_h != h
+      || plat_target.vout_fullscreen != old_fullscreen
+      || !plat_sdl_screen->format || plat_sdl_screen->format->BitsPerPixel != 16))) {
+    Uint32 flags = get_screen_flags();
+    int win_w = w;
+    int win_h = h;
 
-    if (plat_target.vout_fullscreen) {
-      flags |= SDL_FULLSCREEN;
+    if (plat_target.vout_fullscreen && fs_w && fs_h) {
       win_w = fs_w;
       win_h = fs_h;
     }
 
     // XXX: workaround some occasional mysterious deadlock in SDL_SetVideoMode
-    // (seen on r-pi)
     SDL_PumpEvents();
 
     if (!plat_sdl_screen || screen_flags != flags ||
-        plat_sdl_screen->w != win_w || plat_sdl_screen->h != win_h)
-      plat_sdl_screen = SDL_SetVideoMode(win_w, win_h, 0, flags);
-    screen_flags = flags;
+        plat_sdl_screen->w != win_w || plat_sdl_screen->h != win_h ||
+        (!plat_sdl_screen->format || plat_sdl_screen->format->BitsPerPixel != 16))
+      plat_sdl_screen = SDL_SetVideoMode(win_w, win_h, 16, flags);
     if (plat_sdl_screen == NULL) {
       fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
-      plat_target.vout_method = 0;
+      return -1;
     }
+    if (vout_mode_gl != -1)
+      update_wm_display_window();
+    screen_flags = flags;
+    window_w = win_w;
+    window_h = win_h;
   }
 
   if (plat_target.vout_method == vout_mode_overlay
       || plat_target.vout_method == vout_mode_overlay2x) {
-    int W = plat_target.vout_method == vout_mode_overlay2x && w < 640 ? 2*w : w;
+    int W = plat_target.vout_method == vout_mode_overlay2x && !plat_sdl_no_overlay2x ? 2*w : w;
     plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
-    if (plat_sdl_overlay != NULL) {
-      if ((long)plat_sdl_overlay->pixels[0] & 3)
+    if (plat_sdl_overlay != NULL && SDL_LockYUVOverlay(plat_sdl_overlay) == 0) {
+      if ((uintptr_t)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");
@@ -119,43 +163,13 @@ int plat_sdl_change_video_mode(int w, int h, int force)
   }
   else if (plat_target.vout_method == vout_mode_gl) {
     int sw = plat_sdl_screen->w, sh = plat_sdl_screen->h;
-    plat_sdl_gl_active = (gl_init(display, window, &gl_quirks, sw, sh) == 0);
+    plat_sdl_gl_active = (gl_create(window, &gl_quirks, sw, sh) == 0);
     if (!plat_sdl_gl_active) {
       fprintf(stderr, "warning: could not init GL.\n");
       plat_target.vout_method = 0;
     }
   }
 
-  if (plat_target.vout_method == 0) {
-    Uint32 flags;
-    int win_w = w;
-    int win_h = h;
-
-#if defined SDL_SURFACE_SW
-    flags = SDL_SWSURFACE;
-#elif defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
-    flags = SDL_HWSURFACE | SDL_TRIPLEBUF;
-#else
-    flags = SDL_HWSURFACE | SDL_DOUBLEBUF;
-#endif
-    if (plat_target.vout_fullscreen && fs_w && fs_h) {
-      flags |= SDL_FULLSCREEN;
-      win_w = fs_w;
-      win_h = fs_h;
-    }
-
-    SDL_PumpEvents();
-
-    if (!plat_sdl_screen || screen_flags != flags ||
-        plat_sdl_screen->w != win_w || plat_sdl_screen->h != win_h)
-      plat_sdl_screen = SDL_SetVideoMode(win_w, win_h, 16, flags);
-    screen_flags = flags;
-    if (plat_sdl_screen == NULL) {
-      fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
-      return -1;
-    }
-  }
-
   old_fullscreen = plat_target.vout_fullscreen;
   if (plat_sdl_resize_cb != NULL)
     plat_sdl_resize_cb(plat_sdl_screen->w, plat_sdl_screen->h);
@@ -171,12 +185,11 @@ void plat_sdl_event_handler(void *event_)
   switch (event->type) {
   case SDL_VIDEORESIZE:
     //printf("resize %dx%d\n", event->resize.w, event->resize.h);
-    if (plat_target.vout_method != 0
-        && !plat_target.vout_fullscreen && !old_fullscreen)
+    if ((plat_target.vout_method != 0 || window_b) && !plat_target.vout_fullscreen)
     {
-      window_w = event->resize.w & ~3;
-      window_h = event->resize.h & ~3;
-      plat_sdl_change_video_mode(0, 0, 1);
+      int win_w = event->resize.w & ~3;
+      int win_h = event->resize.h & ~3;
+      plat_sdl_change_video_mode(win_w, win_h, 1);
     }
     break;
   case SDL_ACTIVEEVENT:
@@ -188,8 +201,8 @@ void plat_sdl_event_handler(void *event_)
       else if (plat_sdl_gl_active) {
         if (gl_quirks & GL_QUIRK_ACTIVATE_RECREATE) {
           int sw = plat_sdl_screen->w, sh = plat_sdl_screen->h;
-          gl_finish();
-          plat_sdl_gl_active = (gl_init(display, window, &gl_quirks, sw, sh) == 0);
+          gl_destroy();
+          plat_sdl_gl_active = (gl_create(window, &gl_quirks, sw, sh) == 0);
         }
         gl_flip(NULL, 0, 0);
       }
@@ -208,11 +221,11 @@ int plat_sdl_init(void)
 {
   static const char *vout_list[] = { NULL, NULL, NULL, NULL, NULL };
   const SDL_VideoInfo *info;
-  SDL_SysWMinfo wminfo;
   const char *env;
   int overlay_works = 0;
   int gl_works = 0;
   int i, ret, h;
+  Uint32 flags;
   int try_gl;
 
   ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
@@ -242,12 +255,19 @@ int plat_sdl_init(void)
       g_menuscreen_h = h;
   }
 
-  plat_sdl_screen = SDL_SetVideoMode(g_menuscreen_w, g_menuscreen_h, 16, SDL_HWSURFACE);
+  plat_sdl_screen = SDL_SetVideoMode(g_menuscreen_w, g_menuscreen_h, 0,
+      (flags = get_screen_flags()));
   if (plat_sdl_screen == NULL) {
-    plat_sdl_screen = SDL_SetVideoMode(0, 0, 16, SDL_SWSURFACE);
+    fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
+    plat_sdl_screen = SDL_SetVideoMode(0, 0, 0, (flags = get_screen_flags()));
     if (plat_sdl_screen == NULL) {
-      fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
-      goto fail;
+      fprintf(stderr, "attempting SDL_SWSURFACE fallback\n");
+      screen_flags = SDL_SWSURFACE;
+      plat_sdl_screen = SDL_SetVideoMode(0, 0, 0, (flags = get_screen_flags()));
+      if (plat_sdl_screen == NULL) {
+        fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
+        goto fail;
+      }
     }
 
     if (plat_sdl_screen->w < 320 || plat_sdl_screen->h < 240) {
@@ -256,17 +276,12 @@ int plat_sdl_init(void)
       goto fail;
     }
   }
-  g_menuscreen_w = window_w = plat_sdl_screen->w;
-  g_menuscreen_h = window_h = plat_sdl_screen->h;
+  g_menuscreen_w = plat_sdl_screen->w;
+  g_menuscreen_h = plat_sdl_screen->h;
   g_menuscreen_pp = g_menuscreen_w;
-
-  // overlay/gl require native bpp in some cases..
-  plat_sdl_screen = SDL_SetVideoMode(g_menuscreen_w, g_menuscreen_h,
-    0, plat_sdl_screen->flags);
-  if (plat_sdl_screen == NULL) {
-    fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
-    goto fail;
-  }
+  screen_flags = flags;
+  window_w = plat_sdl_screen->w;
+  window_h = plat_sdl_screen->h;
 
   plat_sdl_overlay = SDL_CreateYUVOverlay(plat_sdl_screen->w, plat_sdl_screen->h,
     SDL_UYVY_OVERLAY, plat_sdl_screen);
@@ -275,6 +290,7 @@ int plat_sdl_init(void)
       plat_sdl_overlay->format, plat_sdl_overlay->planes, *plat_sdl_overlay->pitches,
       plat_sdl_overlay->hw_overlay);
 
+    // some platforms require "native" bpp for this to work
     if (plat_sdl_overlay->hw_overlay)
       overlay_works = 1;
     else
@@ -286,21 +302,7 @@ int plat_sdl_init(void)
   else
     fprintf(stderr, "overlay is not available.\n");
 
-  // get x11 display/window for GL
   SDL_VideoDriverName(vid_drv_name, sizeof(vid_drv_name));
-#ifdef SDL_VIDEO_DRIVER_X11
-  if (strcmp(vid_drv_name, "x11") == 0) {
-    SDL_VERSION(&wminfo.version);
-    ret = SDL_GetWMInfo(&wminfo);
-    if (ret > 0) {
-      display = wminfo.info.x11.display;
-      window = (void *)wminfo.info.x11.window;
-    }
-  }
-#else
-  (void)wminfo;
-#endif
-
   ret = -1;
   try_gl = 1;
   env = getenv("DISPLAY");
@@ -313,12 +315,17 @@ int plat_sdl_init(void)
   env = getenv("PICOFE_GL");
   if (env)
     try_gl = atoi(env);
-  if (try_gl)
-    ret = gl_init(display, window, &gl_quirks, g_menuscreen_w, g_menuscreen_h);
+  if (try_gl) {
+    ret = gl_init(display, &gl_quirks);
+    if (ret == 0) {
+      update_wm_display_window();
+      ret = gl_create(window, &gl_quirks, g_menuscreen_w, g_menuscreen_h);
+    }
+  }
   if (ret == 0) {
     gl_announce();
     gl_works = 1;
-    gl_finish();
+    gl_destroy();
   }
 
   i = 0;
@@ -327,7 +334,7 @@ int plat_sdl_init(void)
     plat_target.vout_method = vout_mode_overlay = i;
     vout_list[i++] = "Video Overlay";
 #ifdef SDL_OVERLAY_2X
-    vout_mode_overlay2x = i;
+    plat_target.vout_method = vout_mode_overlay2x = i;
     vout_list[i++] = "Video Overlay 2x";
 #endif
   }
@@ -352,9 +359,11 @@ void plat_sdl_finish(void)
     plat_sdl_overlay = NULL;
   }
   if (plat_sdl_gl_active) {
-    gl_finish();
+    gl_destroy();
     plat_sdl_gl_active = 0;
   }
+  gl_shutdown();
+
   // restore back to initial resolution
   // resolves black screen issue on R-Pi
   if (strcmp(vid_drv_name, "x11") != 0)
@@ -364,7 +373,7 @@ void plat_sdl_finish(void)
 
 void plat_sdl_overlay_clear(void)
 {
-  int pixels = plat_sdl_overlay->w * plat_sdl_overlay->h;
+  int pixels = plat_sdl_overlay->pitches[0]/2 * plat_sdl_overlay->h;
   int *dst = (int *)plat_sdl_overlay->pixels[0];
   int v = 0x10801080;
 
@@ -375,4 +384,29 @@ void plat_sdl_overlay_clear(void)
     *dst = v;
 }
 
+int plat_sdl_is_windowed(void)
+{
+  return window_b != 0;
+}
+
+int plat_sdl_is_fullscreen(void)
+{
+  // consider window title bar and screen menu here
+  return window_w >= fs_w && window_h >= fs_h - 2*window_b;
+}
+
+void plat_sdl_gl_scaling(int type)
+{
+  gl_quirks &= ~GL_QUIRK_SCALING_NEAREST;
+  if (type == 0)
+    gl_quirks |= GL_QUIRK_SCALING_NEAREST;
+}
+
+void plat_sdl_gl_vsync(int on)
+{
+  gl_quirks &= ~GL_QUIRK_VSYNC_ON;
+  if (on)
+    gl_quirks |= GL_QUIRK_VSYNC_ON;
+}
+
 // vim:shiftwidth=2:expandtab