psx_gpu: 2x sprite fixes and integration

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 17fa1ec..484d67b 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -21,6 +21,7 @@
 #include "linux/fbdev.h"
 #include "common/fonts.h"
 #include "common/input.h"
+#include "common/plat.h"
 #include "menu.h"
 #include "main.h"
 #include "plat.h"
@@ -37,7 +38,8 @@ int in_enable_vibration;
 void *tsdev;
 void *pl_vout_buf;
 int g_layer_x, g_layer_y, g_layer_w, g_layer_h;
-static int pl_vout_w, pl_vout_h, pl_vout_bpp;
+static int pl_vout_w, pl_vout_h, pl_vout_bpp; /* output display/layer */
+static int psx_w, psx_h, psx_bpp;
 static int vsync_cnt;
 static int is_pal, frame_interval, frame_interval1024;
 static int vsync_usec_time;
@@ -131,6 +133,58 @@ void pl_print_hud(int xborder)
                print_cpu_usage(w, h, xborder);
 }
 
+/* update scaler target size according to user settings */
+static void update_layer_size(int w, int h)
+{
+       float mult;
+       int imult;
+
+       switch (g_scaler) {
+       case SCALE_1_1:
+               g_layer_w = w; g_layer_h = h;
+               break;
+
+       case SCALE_4_3v2:
+               if (h > g_menuscreen_h || (240 < h && h <= 360))
+                       goto fractional_4_3;
+
+               // 4:3 that prefers integer scaling
+               imult = g_menuscreen_h / h;
+               g_layer_w = w * imult;
+               g_layer_h = h * imult;
+               mult = (float)g_layer_w / (float)g_layer_h;
+               if (mult < 1.25f || mult > 1.666f)
+                       g_layer_w = 4.0f/3.0f * (float)g_layer_h;
+               printf("  -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+               break;
+
+       fractional_4_3:
+       case SCALE_4_3:
+               mult = 240.0f / (float)h * 4.0f / 3.0f;
+               if (h > 256)
+                       mult *= 2.0f;
+               g_layer_w = mult * (float)g_menuscreen_h;
+               g_layer_h = g_menuscreen_h;
+               printf("  -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+               break;
+
+       case SCALE_FULLSCREEN:
+               g_layer_w = g_menuscreen_w;
+               g_layer_h = g_menuscreen_h;
+               break;
+
+       default:
+               break;
+       }
+
+       g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
+       g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
+       if (g_layer_x < 0) g_layer_x = 0;
+       if (g_layer_y < 0) g_layer_y = 0;
+       if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
+       if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h;
+}
+
 static void *pl_vout_set_mode(int w, int h, int bpp)
 {
        // special h handling, Wipeout likes to change it by 1-6
@@ -139,18 +193,21 @@ static void *pl_vout_set_mode(int w, int h, int bpp)
                h = (h + 7) & ~7;
        vsync_cnt_ms_prev = vsync_cnt;
 
-       if (w == pl_vout_w && h == pl_vout_h && bpp == pl_vout_bpp)
+       if (w == psx_w && h == psx_h && bpp == psx_bpp)
                return pl_vout_buf;
 
-       pl_vout_w = w;
-       pl_vout_h = h;
-       pl_vout_bpp = bpp;
+       pl_vout_w = psx_w = w;
+       pl_vout_h = psx_h = h;
+       pl_vout_bpp = psx_bpp = bpp;
+
+       update_layer_size(pl_vout_w, pl_vout_h);
 
        pl_vout_buf = plat_gvideo_set_mode(&pl_vout_w, &pl_vout_h, &pl_vout_bpp);
-       if (pl_vout_buf == NULL)
-               fprintf(stderr, "failed to set mode\n");
+       if (pl_vout_buf == NULL && pl_rearmed_cbs.pl_vout_raw_flip == NULL)
+               fprintf(stderr, "failed to set mode %dx%d@%d\n",
+                       psx_w, psx_h, psx_bpp);
 
-       menu_notify_mode_change(w, h, bpp);
+       menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp);
 
        return pl_vout_buf;
 }
@@ -174,9 +231,9 @@ static int pl_vout_open(void)
        int h;
 
        // force mode update
-       h = pl_vout_h;
-       pl_vout_h--;
-       pl_vout_buf = pl_vout_set_mode(pl_vout_w, h, pl_vout_bpp);
+       h = psx_h;
+       psx_h--;
+       pl_vout_buf = pl_vout_set_mode(psx_w, h, psx_bpp);
 
        plat_gvideo_open(is_pal);
 
@@ -428,12 +485,24 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
        *h = g_layer_h;
 }
 
+static void *pl_mmap(unsigned int size)
+{
+       return plat_mmap(0, size, 0, 0);
+}
+
+static void pl_munmap(void *ptr, unsigned int size)
+{
+       plat_munmap(ptr, size);
+}
+
 struct rearmed_cbs pl_rearmed_cbs = {
        pl_get_layer_pos,
        pl_vout_open,
        pl_vout_set_mode,
        pl_vout_flip,
        pl_vout_close,
+       pl_mmap,
+       pl_munmap,
 };
 
 /* watchdog */
@@ -495,8 +564,8 @@ void pl_init(void)
        extern unsigned int hSyncCount; // from psxcounters
        extern unsigned int frame_counter;
 
-       pl_vout_w = pl_vout_h = 256;
-       pl_vout_bpp = 16;
+       psx_w = psx_h = pl_vout_w = pl_vout_h = 256;
+       psx_bpp = pl_vout_bpp = 16;
 
        tsdev = pl_gun_ts_init();