arm_utils: relax alignment requirements

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 5cf1ff4..ee0e086 100644 (file)
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -35,6 +35,7 @@ static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
 static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
 static float vsps_cur;
 static int plugin_skip_advice;
+static int vsync_usec_time;
 // P.E.Op.S.
 extern int UseFrameSkip;
 extern float fps_skip;
@@ -121,8 +122,18 @@ void *pl_fbdev_flip(void)
 
 int pl_fbdev_open(void)
 {
+       struct timeval now;
+
        pl_fbdev_buf = vout_fbdev_flip(layer_fb);
        omap_enable_layer(1);
+
+       // try to align redraws to vsync
+       vout_fbdev_wait_vsync(layer_fb);
+       gettimeofday(&now, 0);
+       vsync_usec_time = now.tv_usec;
+       while (vsync_usec_time >= pl_frame_interval)
+               vsync_usec_time -= pl_frame_interval;
+
        return 0;
 }
 
@@ -131,6 +142,15 @@ void pl_fbdev_close(void)
        omap_enable_layer(0);
 }
 
+void *pl_prepare_screenshot(int *w, int *h, int *bpp)
+{
+       *w = pl_fbdev_w;
+       *h = pl_fbdev_h;
+       *bpp = pl_fbdev_bpp;
+
+       return pl_fbdev_buf;
+}
+
 static void update_input(void)
 {
        int actions[IN_BINDTYPE_COUNT] = { 0, };
@@ -151,8 +171,9 @@ static void update_input(void)
        in_keystate = actions[IN_BINDTYPE_PLAYER12];
 
 #ifdef X11
-       extern int x11_update_keys(void);
-       in_keystate |= x11_update_keys();
+       extern int x11_update_keys(unsigned int *action);
+       in_keystate |= x11_update_keys(&emu_act);
+       emu_set_action(emu_act);
 #endif
 }
 
@@ -175,7 +196,7 @@ void pl_frame_limit(void)
        static struct timeval tv_old, tv_expect;
        static int vsync_cnt_prev;
        struct timeval now;
-       int diff;
+       int diff, usadj;
 
        vsync_cnt++;
 
@@ -218,6 +239,11 @@ void pl_frame_limit(void)
                //printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
                tv_expect = now;
                diff = 0;
+               // try to align with vsync
+               usadj = vsync_usec_time;
+               while (usadj < tv_expect.tv_usec - pl_frame_interval)
+                       usadj += pl_frame_interval;
+               tv_expect.tv_usec = usadj;
        }
 
        if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {