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 frame_interval, frame_interval1024, vsync_usec_time;
+static int is_pal, frame_interval, frame_interval1024;
+static int vsync_usec_time;
static __attribute__((noinline)) int get_cpu_ticks(void)
{
int w = pl_vout_w, h = pl_vout_h;
+ if (h < 16)
+ return;
+
if (g_opts & OPT_SHOWSPU)
draw_active_chans(w, h);
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;
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;
}
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();
+ plat_gvideo_open(is_pal);
gettimeofday(&now, 0);
vsync_usec_time = now.tv_usec;
pcnt_start(PCNT_ALL);
}
-void pl_timing_prepare(int is_pal)
+void pl_timing_prepare(int is_pal_)
{
pl_rearmed_cbs.fskip_advice = 0;
pl_rearmed_cbs.flips_per_sec = 0;
pl_rearmed_cbs.cpu_usage = 0;
+ is_pal = is_pal_;
frame_interval = is_pal ? 20000 : 16667;
frame_interval1024 = is_pal ? 20000*1024 : 17066667;
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();