X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=9003ff8bf4a5860eaac77074928e4f3fea8a2dde;hp=c931518044cc1b61b2c663673f0b04a07abf93fd;hb=478216725b77d1c7fd45d972e3c596134633adba;hpb=55b0eeea6028e00741e620d28ab3211c49b8515f

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index c9315180..9003ff8b 100644
--- 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;
@@ -61,22 +62,22 @@ static __attribute__((noinline)) int get_cpu_ticks(void)
 	return ret;
 }
 
-static void print_msg(int h)
+static void print_msg(int h, int border)
 {
 	if (pl_vout_bpp == 16)
-		pl_text_out16(2, h - 10, "%s", hud_msg);
+		pl_text_out16(border + 2, h - 10, "%s", hud_msg);
 }
 
-static void print_fps(int h)
+static void print_fps(int h, int border)
 {
 	if (pl_vout_bpp == 16)
-		pl_text_out16(2, h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
+		pl_text_out16(border + 2, h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
 }
 
-static void print_cpu_usage(int w, int h)
+static void print_cpu_usage(int w, int h, int border)
 {
 	if (pl_vout_bpp == 16)
-		pl_text_out16(w - 28, h - 10, "%3d", tick_per_sec);
+		pl_text_out16(w - border - 28, h - 10, "%3d", tick_per_sec);
 }
 
 // draw 192x8 status of 24 sound channels
@@ -109,7 +110,7 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
 	}
 }
 
-void pl_print_hud(int w, int h)
+void pl_print_hud(int w, int h, int xborder)
 {
 	pl_vout_w = w; // used by pollux
 	pl_vout_h = h;
@@ -118,12 +119,12 @@ void pl_print_hud(int w, int h)
 		draw_active_chans(w, h);
 
 	if (hud_msg[0] != 0)
-		print_msg(h);
+		print_msg(h, xborder);
 	else if (g_opts & OPT_SHOWFPS)
-		print_fps(h);
+		print_fps(h, xborder);
 
 	if (g_opts & OPT_SHOWCPU)
-		print_cpu_usage(w, h);
+		print_cpu_usage(w, h, xborder);
 }
 
 static void *pl_vout_set_mode(int w, int h, int bpp)
@@ -164,7 +165,7 @@ static void *pl_vout_flip(void)
 	pl_flip_cnt++;
 
 	if (pl_vout_buf != NULL)
-		pl_print_hud(pl_vout_w, pl_vout_h);
+		pl_print_hud(pl_vout_w, pl_vout_h, 0);
 
 	// let's flip now
 #if defined(VOUT_FBDEV)
@@ -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);
@@ -410,7 +426,7 @@ static void *watchdog_thread(void *unused)
 	int seen_dead = 0;
 	int sleep_time = 5;
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DRC_DBG)
 	// don't interfere with debug
 	return NULL;
 #endif
@@ -462,5 +478,5 @@ void pl_init(void)
 	pl_vout_w = pl_vout_h = 256;
 	pl_vout_bpp = 16;
 
-	ts = pl_gun_ts_init();
+	tsdev = pl_gun_ts_init();
 }