X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plat_sdl.c;h=97e2d29e35510a0b65e6018c0222031fbcd594f6;hb=33787db41d955f8dcafe833097f2cc87d70186ec;hp=2d38fcc58e0207119be14c0144ce6da5cf2dd557;hpb=34e55f235ebde37616a8661231f972990b87d6bf;p=libpicofe.git

diff --git a/plat_sdl.c b/plat_sdl.c
index 2d38fcc..97e2d29 100644
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -101,11 +101,13 @@ int plat_sdl_change_video_mode(int w, int h, int force)
       || 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");
@@ -186,9 +188,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;
+  int try_gl;
 
   ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
   if (ret != 0) {
@@ -231,6 +235,7 @@ int plat_sdl_init(void)
   }
   g_menuscreen_w = window_w = plat_sdl_screen->w;
   g_menuscreen_h = window_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,
@@ -273,8 +278,22 @@ int plat_sdl_init(void)
   (void)wminfo;
 #endif
 
-  ret = gl_init(display, window, &gl_quirks);
+  ret = -1;
+  try_gl = 1;
+  env = getenv("DISPLAY");
+  if (env && env[0] != ':') {
+    fprintf(stderr, "looks like a remote DISPLAY, "
+      "not trying GL (use PICOFE_GL=1 to override)\n");
+    // because some drivers just kill the program with no way to recover
+    try_gl = 0;
+  }
+  env = getenv("PICOFE_GL");
+  if (env)
+    try_gl = atoi(env);
+  if (try_gl)
+    ret = gl_init(display, window, &gl_quirks);
   if (ret == 0) {
+    gl_announce();
     gl_works = 1;
     gl_finish();
   }
@@ -295,6 +314,7 @@ int plat_sdl_init(void)
   }
   plat_target.vout_methods = vout_list;
 
+  plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 1);
   return 0;
 
 fail: