X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_sdl.c;h=e3d70f60929cb1b2a0463eb8adc1024c201ab469;hp=a899c1599194a46215a1f3970ac96e7ef939090c;hb=69e482e3def6669a4fa921d07f9ba04883d7de34;hpb=a83762012066e4799394f63d08a161a45f982ab6

diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c
index a899c159..e3d70f60 100644
--- a/frontend/plat_sdl.c
+++ b/frontend/plat_sdl.c
@@ -14,9 +14,12 @@
 #include "libpicofe/input.h"
 #include "libpicofe/in_sdl.h"
 #include "libpicofe/menu.h"
+#include "libpicofe/fonts.h"
+#include "libpicofe/plat_sdl.h"
+#include "libpicofe/gl.h"
+#include "../plugins/gpulib/cspace.h"
 #include "plugin_lib.h"
 #include "main.h"
-#include "menu.h"
 #include "plat.h"
 #include "revision.h"
 
@@ -49,223 +52,156 @@ static const struct in_default_bind in_sdl_defbinds[] = {
   { 0, 0, 0 }
 };
 
-// XXX: maybe determine this instead..
-#define WM_DECORATION_H 32
-
-static SDL_Surface *screen;
-static SDL_Overlay *overlay;
-static int window_w, window_h;
-static int fs_w, fs_h;
 static int psx_w, psx_h;
-static void *menubg_img;
-static int in_menu, pending_resize, old_fullscreen;
+static void *shadow_fb, *menubg_img;
+static int in_menu;
 
-static int change_video_mode(int w, int h)
+static int change_video_mode(void)
 {
-  psx_w = w;
-  psx_h = h;
-
-  if (overlay != NULL) {
-    SDL_FreeYUVOverlay(overlay);
-    overlay = NULL;
-  }
+  int w, h;
 
-  if (g_use_overlay && !in_menu) {
-    Uint32 flags = SDL_RESIZABLE;
-    int win_w = window_w;
-    int win_h = window_h;
-
-    if (g_fullscreen) {
-      flags |= SDL_FULLSCREEN;
-      win_w = fs_w;
-      win_h = fs_h;
-    }
-
-    screen = SDL_SetVideoMode(win_w, win_h, 0, flags);
-    if (screen == NULL) {
-      fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
-      return -1;
-    }
-
-    overlay = SDL_CreateYUVOverlay(w, h, SDL_UYVY_OVERLAY, screen);
-    if (overlay != NULL) {
-      /*printf("overlay: fmt %x, planes: %d, pitch: %d, hw: %d\n",
-        overlay->format, overlay->planes, *overlay->pitches,
-        overlay->hw_overlay);*/
-
-      if ((long)overlay->pixels[0] & 3)
-        fprintf(stderr, "warning: overlay pointer is unaligned\n");
-      if (!overlay->hw_overlay)
-        fprintf(stderr, "warning: video overlay is not hardware accelerated,"
-                        " you may want to disable it.\n");
-    }
-    else {
-      fprintf(stderr, "warning: could not create overlay.\n");
-    }
+  if (in_menu) {
+    w = g_menuscreen_w;
+    h = g_menuscreen_h;
   }
-
-  if (overlay == NULL) {
-    screen = SDL_SetVideoMode(w, h, 16, 0);
-    if (screen == NULL) {
-      fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
-      return -1;
-    }
-
-    if (!in_menu) {
-      window_w = screen->w;
-      window_h = screen->h;
-    }
+  else {
+    w = psx_w;
+    h = psx_h;
   }
 
-  old_fullscreen = g_fullscreen;
-  return 0;
+  return plat_sdl_change_video_mode(w, h, 0);
 }
 
-static void event_handler(void *event_)
+static void quit_cb(void)
 {
-  SDL_Event *event = event_;
-
-  if (event->type == SDL_VIDEORESIZE) {
-    //printf("%dx%d\n", event->resize.w, event->resize.h);
-    if (overlay != NULL && !g_fullscreen && !old_fullscreen) {
-      window_w = event->resize.w;
-      window_h = event->resize.h;
-      pending_resize = 1;
-    }
-  }
+  emu_core_ask_exit();
 }
 
 void plat_init(void)
 {
-  const SDL_VideoInfo *info;
-  int ret, h;
+  int ret;
 
-  ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
-  if (ret != 0) {
-    fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+  ret = plat_sdl_init();
+  if (ret != 0)
     exit(1);
-  }
-
-  info = SDL_GetVideoInfo();
-  if (info != NULL) {
-    fs_w = info->current_w;
-    fs_h = info->current_h;
-  }
 
   in_menu = 1;
-  g_menuscreen_w = 640;
-  if (fs_w != 0 && g_menuscreen_w > fs_w)
-    g_menuscreen_w = fs_w;
-  g_menuscreen_h = 480;
-  if (fs_h != 0) {
-    h = fs_h;
-    if (info && info->wm_available && h > WM_DECORATION_H)
-      h -= WM_DECORATION_H;
-    if (g_menuscreen_h > h)
-      g_menuscreen_h = h;
-  }
-
-  ret = change_video_mode(g_menuscreen_w, g_menuscreen_h);
-  if (ret != 0) {
-    ret = change_video_mode(0, 0);
-    if (ret != 0)
-      goto fail;
-
-    if (screen->w < 320 || screen->h < 240) {
-      fprintf(stderr, "resolution %dx%d is too small, sorry.\n",
-              screen->w, screen->h);
-      goto fail;
-    }
-  }
-  g_menuscreen_w = window_w = screen->w;
-  g_menuscreen_h = window_h = screen->h;
-
   SDL_WM_SetCaption("PCSX-ReARMed " REV, NULL);
 
+  shadow_fb = malloc(640 * 512 * 2);
   menubg_img = malloc(640 * 512 * 2);
-  if (menubg_img == NULL)
-    goto fail;
+  if (shadow_fb == NULL || menubg_img == NULL) {
+    fprintf(stderr, "OOM\n");
+    exit(1);
+  }
 
-  in_sdl_init(in_sdl_defbinds, event_handler);
+  in_sdl_init(in_sdl_defbinds, plat_sdl_event_handler);
   in_probe();
   pl_rearmed_cbs.only_16bpp = 1;
-  return;
 
-fail:
-  SDL_Quit();
-  exit(1);
+  bgr_to_uyvy_init();
+  plat_sdl_quit_cb = quit_cb;
 }
 
 void plat_finish(void)
 {
+  free(shadow_fb);
+  shadow_fb = NULL;
   free(menubg_img);
   menubg_img = NULL;
-  SDL_Quit();
+  plat_sdl_finish();
 }
 
 void plat_gvideo_open(int is_pal)
 {
 }
 
-void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
+static void uyvy_to_rgb565(void *d, const void *s, int pixels)
+{
+  unsigned short *dst = d;
+  const unsigned int *src = s;
+  int v;
+
+  // no colors, for now
+  for (; pixels > 0; src++, dst += 2, pixels -= 2) {
+    v = (*src >> 8) & 0xff;
+    v = (v - 16) * 255 / 219 / 8;
+    dst[0] = (v << 11) | (v << 6) | v;
+
+    v = (*src >> 24) & 0xff;
+    v = (v - 16) * 255 / 219 / 8;
+    dst[1] = (v << 11) | (v << 6) | v;
+  }
+}
+
+static void overlay_blit(int doffs, const void *src_, int w, int h,
+                         int sstride, int bgr24)
+{
+  const unsigned short *src = src_;
+  unsigned short *dst;
+  int dstride = plat_sdl_overlay->w;
+
+  SDL_LockYUVOverlay(plat_sdl_overlay);
+  dst = (void *)plat_sdl_overlay->pixels[0];
+
+  dst += doffs;
+  if (bgr24) {
+    for (; h > 0; dst += dstride, src += sstride, h--)
+      bgr888_to_uyvy(dst, src, w);
+  }
+  else {
+    for (; h > 0; dst += dstride, src += sstride, h--)
+      bgr555_to_uyvy(dst, src, w);
+  }
+
+  SDL_UnlockYUVOverlay(plat_sdl_overlay);
+}
+
+static void overlay_hud_print(int x, int y, const char *str, int bpp)
 {
-  change_video_mode(*w, *h);
-  return screen->pixels;
+  SDL_LockYUVOverlay(plat_sdl_overlay);
+  basic_text_out_uyvy_nf(plat_sdl_overlay->pixels[0], plat_sdl_overlay->w, x, y, str);
+  SDL_UnlockYUVOverlay(plat_sdl_overlay);
 }
 
-static void test_convert(void *d, const void *s, int pixels)
+void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
 {
-  unsigned int *dst = d;
-  const unsigned short *src = s;
-  int r0, g0, b0, r1, g1, b1;
-  int y0, y1, u, v;
-
-  for (; pixels > 0; src += 2, dst++, pixels -= 2) {
-    r0 =  src[0] >> 11;
-    g0 = (src[0] >> 6) & 0x1f;
-    b0 =  src[0] & 0x1f;
-    r1 =  src[1] >> 11;
-    g1 = (src[1] >> 6) & 0x1f;
-    b1 =  src[1] & 0x1f;
-    y0 = (int)((0.299f * r0) + (0.587f * g0) + (0.114f * b0));
-    y1 = (int)((0.299f * r1) + (0.587f * g1) + (0.114f * b1));
-    //u = (int)(((-0.169f * r0) + (-0.331f * g0) + ( 0.499f * b0)) * 8) + 128;
-    //v = (int)((( 0.499f * r0) + (-0.418f * g0) + (-0.0813f * b0)) * 8) + 128;
-    u = (int)(8 * 0.565f * (b0 - y0)) + 128;
-    v = (int)(8 * 0.713f * (r0 - y0)) + 128;
-    // valid Y range seems to be 16..235
-    y0 = 16 + 219 * y0 / 31;
-    y1 = 16 + 219 * y1 / 31;
-
-    if (y0 < 0 || y0 > 255 || y1 < 0 || y1 > 255
-        || u < 0 || u > 255 || v < 0 || v > 255)
-    {
-      printf("oor: %d, %d, %d, %d\n", y0, y1, u, v);
-    }
-    *dst = (y1 << 24) | (v << 16) | (y0 << 8) | u;
+  psx_w = *w;
+  psx_h = *h;
+  change_video_mode();
+  if (plat_sdl_overlay != NULL) {
+    pl_plat_clear = plat_sdl_overlay_clear;
+    pl_plat_blit = overlay_blit;
+    pl_plat_hud_print = overlay_hud_print;
+    return NULL;
+  }
+  else {
+    pl_plat_clear = NULL;
+    pl_plat_blit = NULL;
+    pl_plat_hud_print = NULL;
+    if (plat_sdl_gl_active)
+      return shadow_fb;
+    else
+      return plat_sdl_screen->pixels;
   }
 }
 
-/* XXX: missing SDL_LockSurface() */
 void *plat_gvideo_flip(void)
 {
-  if (!in_menu && overlay != NULL) {
-    SDL_Rect dstrect = { 0, 0, screen->w, screen->h };
-    SDL_LockYUVOverlay(overlay);
-    test_convert(overlay->pixels[0], screen->pixels, overlay->w * overlay->h);
-    SDL_UnlockYUVOverlay(overlay);
-    SDL_DisplayYUVOverlay(overlay, &dstrect);
+  if (plat_sdl_overlay != NULL) {
+    SDL_Rect dstrect = { 0, 0, plat_sdl_screen->w, plat_sdl_screen->h };
+    SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect);
+    return NULL;
   }
-  else
-    SDL_Flip(screen);
-
-  if (pending_resize || g_fullscreen != old_fullscreen) {
-    // must be done here so that correct buffer is returned
-    change_video_mode(psx_w, psx_h);
-    pending_resize = 0;
+  else if (plat_sdl_gl_active) {
+    gl_flip(shadow_fb, psx_w, psx_h);
+    return shadow_fb;
+  }
+  else {
+    // XXX: no locking, but should be fine with SDL_SWSURFACE?
+    SDL_Flip(plat_sdl_screen);
+    return plat_sdl_screen->pixels;
   }
-
-  return screen->pixels;
 }
 
 void plat_gvideo_close(void)
@@ -277,23 +213,47 @@ void plat_video_menu_enter(int is_rom_loaded)
   in_menu = 1;
 
   /* surface will be lost, must adjust pl_vout_buf for menu bg */
-  // FIXME?
-  memcpy(menubg_img, screen->pixels, psx_w * psx_h * 2);
+  if (plat_sdl_overlay != NULL)
+    uyvy_to_rgb565(menubg_img, plat_sdl_overlay->pixels[0], psx_w * psx_h);
+  else if (plat_sdl_gl_active)
+    memcpy(menubg_img, shadow_fb, psx_w * psx_h * 2);
+  else
+    memcpy(menubg_img, plat_sdl_screen->pixels, psx_w * psx_h * 2);
   pl_vout_buf = menubg_img;
 
-  change_video_mode(g_menuscreen_w, g_menuscreen_h);
+  change_video_mode();
 }
 
 void plat_video_menu_begin(void)
 {
-  SDL_LockSurface(screen);
-  g_menuscreen_ptr = screen->pixels;
+  if (plat_sdl_overlay != NULL || plat_sdl_gl_active) {
+    g_menuscreen_ptr = shadow_fb;
+  }
+  else {
+    SDL_LockSurface(plat_sdl_screen);
+    g_menuscreen_ptr = plat_sdl_screen->pixels;
+  }
 }
 
 void plat_video_menu_end(void)
 {
-  SDL_UnlockSurface(screen);
-  SDL_Flip(screen);
+  if (plat_sdl_overlay != NULL) {
+    SDL_Rect dstrect = { 0, 0, plat_sdl_screen->w, plat_sdl_screen->h };
+
+    SDL_LockYUVOverlay(plat_sdl_overlay);
+    rgb565_to_uyvy(plat_sdl_overlay->pixels[0], shadow_fb,
+      g_menuscreen_w * g_menuscreen_h);
+    SDL_UnlockYUVOverlay(plat_sdl_overlay);
+
+    SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect);
+  }
+  else if (plat_sdl_gl_active) {
+    gl_flip(g_menuscreen_ptr, g_menuscreen_w, g_menuscreen_h);
+  }
+  else {
+    SDL_UnlockSurface(plat_sdl_screen);
+    SDL_Flip(plat_sdl_screen);
+  }
   g_menuscreen_ptr = NULL;
 }