From ddc0a02a811034532a8e013c14091b61a89439ba Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 1 Aug 2012 01:59:38 +0300 Subject: frontend: track output and psx sizes separately output layer and psx resolutions don't have to match, like it is on Caanoo. --- frontend/menu.c | 30 +++++++++++++++--------------- frontend/plat_pollux.c | 1 + frontend/plugin_lib.c | 28 +++++++++++++++------------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/frontend/menu.c b/frontend/menu.c index 301a10d..6a50d16 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -86,7 +86,7 @@ enum { SCALE_CUSTOM, }; -static int last_psx_w, last_psx_h, last_psx_bpp; +static int last_vout_w, last_vout_h, last_vout_bpp; static int scaling, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; @@ -2239,9 +2239,9 @@ void menu_init(void) menu_set_defconfig(); menu_load_config(0); menu_do_last_cd_img(1); - last_psx_w = 320; - last_psx_h = 240; - last_psx_bpp = 16; + last_vout_w = 320; + last_vout_h = 240; + last_vout_bpp = 16; g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); g_menubg_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); @@ -2270,9 +2270,9 @@ void menu_notify_mode_change(int w, int h, int bpp) float mult; int imult; - last_psx_w = w; - last_psx_h = h; - last_psx_bpp = bpp; + last_vout_w = w; + last_vout_h = h; + last_vout_bpp = bpp; // XXX: should really menu code cotrol the layer size? switch (scaling) { @@ -2333,19 +2333,19 @@ static void menu_leave_emu(void) memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); if (pl_vout_buf != NULL && ready_to_go) { - int x = max(0, g_menuscreen_w - last_psx_w); - int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2); - int w = min(g_menuscreen_w, last_psx_w); - int h = min(g_menuscreen_h, last_psx_h); + int x = max(0, g_menuscreen_w - last_vout_w); + int y = max(0, g_menuscreen_h / 2 - last_vout_h / 2); + int w = min(g_menuscreen_w, last_vout_w); + int h = min(g_menuscreen_h, last_vout_h); u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; char *s = pl_vout_buf; - if (last_psx_bpp == 16) { - for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 2) + if (last_vout_bpp == 16) { + for (; h > 0; h--, d += g_menuscreen_w, s += last_vout_w * 2) menu_darken_bg(d, s, w, 0); } else { - for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 3) { + for (; h > 0; h--, d += g_menuscreen_w, s += last_vout_w * 3) { rgb888_to_rgb565(d, s, w * 3); menu_darken_bg(d, d, w, 0); } @@ -2362,7 +2362,7 @@ void menu_prepare_emu(void) plat_video_menu_leave(); - menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); + menu_notify_mode_change(last_vout_w, last_vout_h, last_vout_bpp); psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; if (psxCpu != prev_cpu) diff --git a/frontend/plat_pollux.c b/frontend/plat_pollux.c index 8395e54..57031d8 100644 --- a/frontend/plat_pollux.c +++ b/frontend/plat_pollux.c @@ -258,6 +258,7 @@ void plat_video_menu_leave(void) memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8); g_menuscreen_ptr = fb_flip(); + memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8); } void *plat_prepare_screenshot(int *w, int *h, int *bpp) diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 17fa1ec..1a925ec 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -37,7 +37,8 @@ int in_enable_vibration; 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 is_pal, frame_interval, frame_interval1024; static int vsync_usec_time; @@ -139,18 +140,19 @@ static void *pl_vout_set_mode(int w, int h, int bpp) 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; } @@ -174,9 +176,9 @@ static int pl_vout_open(void) 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(is_pal); @@ -495,8 +497,8 @@ void pl_init(void) 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(); -- cgit v1.2.3