remove gpu vblank callbacks

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index c719f48..e93c12f 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -24,6 +24,7 @@
 #include "omap.h"
 #include "menu.h"
 #include "main.h"
+#include "plat.h"
 #include "pcnt.h"
 #include "pl_gun_ts.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
@@ -33,7 +34,7 @@ int in_type1, in_type2;
 int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_keystate, in_state_gun;
 int pl_flip_cnt;
-static void *ts;
+void *tsdev;
 void *pl_vout_buf;
 static int pl_vout_w, pl_vout_h, pl_vout_bpp;
 static int vsync_cnt, flips_per_sec, tick_per_sec;
@@ -209,11 +210,15 @@ static void pl_vout_close(void)
 
 void *pl_prepare_screenshot(int *w, int *h, int *bpp)
 {
+#if defined(VOUT_FBDEV)
        *w = pl_vout_w;
        *h = pl_vout_h;
        *bpp = pl_vout_bpp;
 
        return pl_vout_buf;
+#else
+       return plat_prepare_screenshot(w, h, bpp);
+#endif
 }
 
 static void update_input(void)
@@ -248,8 +253,8 @@ static void update_input(void)
 
 void pl_update_gun(int *xn, int *xres, int *y, int *in)
 {
-       if (ts)
-               pl_gun_ts_update(ts, xn, y, in);
+       if (tsdev)
+               pl_gun_ts_update(tsdev, xn, y, in);
 
        *xres = pl_vout_w;
        *y = *y * pl_vout_h >> 10;
@@ -264,7 +269,7 @@ void pl_update_gun(int *xn, int *xres, int *y, int *in)
 void pl_frame_limit(void)
 {
        static struct timeval tv_old, tv_expect;
-       static int vsync_cnt_prev;
+       static int vsync_cnt_prev, drc_active_vsyncs;
        struct timeval now;
        int diff, usadj;
 
@@ -333,6 +338,17 @@ void pl_frame_limit(void)
                        pl_rearmed_cbs.fskip_advice = 1;
                else if (diff >= 0)
                        pl_rearmed_cbs.fskip_advice = 0;
+
+               // recompilation is not that fast and may cause frame skip on
+               // loading screens and such, resulting in flicker or glitches
+               if (new_dynarec_did_compile) {
+                       if (drc_active_vsyncs < 32)
+                               pl_rearmed_cbs.fskip_advice = 0;
+                       drc_active_vsyncs++;
+               }
+               else
+                       drc_active_vsyncs = 0;
+               new_dynarec_did_compile = 0;
        }
 
        pcnt_start(PCNT_ALL);
@@ -459,8 +475,12 @@ void pl_start_watchdog(void)
 
 void pl_init(void)
 {
+       extern unsigned int hSyncCount; // from psxcounters
+
        pl_vout_w = pl_vout_h = 256;
        pl_vout_bpp = 16;
 
-       ts = pl_gun_ts_init();
+       tsdev = pl_gun_ts_init();
+
+       pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
 }