X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=5017a1bbede866ef5dcdbf183644d6d068649bf4;hp=3ee59472fa5fbeafb091f850dc380727c75d6900;hb=a1b44e3650691750cff4bf1c5bc04a36c3e8066d;hpb=2857d72e4ca743bba3cf55e298949e24d97dff02

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 3ee59472..5017a1bb 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -17,18 +17,17 @@
 #include <unistd.h>
 #include <pthread.h>
 
+#include "libpicofe/fonts.h"
+#include "libpicofe/input.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/arm/neon_scale2x.h"
+#include "libpicofe/arm/neon_eagle2x.h"
 #include "plugin_lib.h"
-#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"
 #include "pcnt.h"
 #include "pl_gun_ts.h"
-#include "libpicofe/arm/neon_scale2x.h"
-#include "libpicofe/arm/neon_eagle2x.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
 #include "../plugins/gpulib/cspace.h"
@@ -249,6 +248,8 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 	int dstride = pl_vout_w, h1 = h;
 	int doffs;
 
+	pcnt_start(PCNT_BLIT);
+
 	if (dest == NULL)
 		goto out;
 
@@ -312,6 +313,8 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 	pl_print_hud(w * pl_vout_scale, h * pl_vout_scale, 0);
 
 out:
+	pcnt_end(PCNT_BLIT);
+
 	// let's flip now
 	pl_vout_buf = plat_gvideo_flip();
 	pl_rearmed_cbs.flip_cnt++;
@@ -471,11 +474,6 @@ static void update_input(void)
 	emu_set_action(emu_act);
 
 	in_keystate = actions[IN_BINDTYPE_PLAYER12];
-#ifdef X11
-	extern int x11_update_keys(unsigned int *action);
-	in_keystate |= x11_update_keys(&emu_act);
-	emu_set_action(emu_act);
-#endif
 }
 #else /* MAEMO */
 static void update_input(void)