X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=4dbb9a7d7f6da6ccbb2842776516d4526683315e;hp=e79e523207a028cae71c8a5f8730e3f539ab0616;hb=9e5ac38fda66536f2a9e6dd2a747ae37538c3638;hpb=a92f6af13d44b1c3c6f0fb23350a3990b0dff95e diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index e79e5232..4dbb9a7d 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -21,7 +21,6 @@ #include "linux/fbdev.h" #include "common/fonts.h" #include "common/input.h" -#include "omap.h" #include "menu.h" #include "main.h" #include "plat.h" @@ -37,9 +36,12 @@ int in_keystate, in_state_gun; int in_enable_vibration; void *tsdev; void *pl_vout_buf; -static int pl_vout_w, pl_vout_h, pl_vout_bpp; +int g_layer_x, g_layer_y, g_layer_w, g_layer_h; +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) @@ -111,10 +113,12 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h) } } -void pl_print_hud(int w, int h, int xborder) +void pl_print_hud(int xborder) { - pl_vout_w = w; // used by pollux - pl_vout_h = h; + int w = pl_vout_w, h = pl_vout_h; + + if (h < 16) + return; if (g_opts & OPT_SHOWSPU) draw_active_chans(w, h); @@ -128,6 +132,58 @@ void pl_print_hud(int w, int h, int xborder) print_cpu_usage(w, h, xborder); } +/* update scaler target size according to user settings */ +static void update_layer_size(int w, int h) +{ + float mult; + int imult; + + switch (g_scaler) { + case SCALE_1_1: + g_layer_w = w; g_layer_h = h; + break; + + case SCALE_4_3v2: + if (h > g_menuscreen_h || (240 < h && h <= 360)) + goto fractional_4_3; + + // 4:3 that prefers integer scaling + imult = g_menuscreen_h / h; + g_layer_w = w * imult; + g_layer_h = h * imult; + mult = (float)g_layer_w / (float)g_layer_h; + if (mult < 1.25f || mult > 1.666f) + g_layer_w = 4.0f/3.0f * (float)g_layer_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + fractional_4_3: + case SCALE_4_3: + mult = 240.0f / (float)h * 4.0f / 3.0f; + if (h > 256) + mult *= 2.0f; + g_layer_w = mult * (float)g_menuscreen_h; + g_layer_h = g_menuscreen_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + case SCALE_FULLSCREEN: + g_layer_w = g_menuscreen_w; + g_layer_h = g_menuscreen_h; + break; + + default: + break; + } + + g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2; + g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2; + if (g_layer_x < 0) g_layer_x = 0; + if (g_layer_y < 0) g_layer_y = 0; + if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w; + if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h; +} + static void *pl_vout_set_mode(int w, int h, int bpp) { // special h handling, Wipeout likes to change it by 1-6 @@ -136,65 +192,49 @@ 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; -#if defined(VOUT_FBDEV) - vout_fbdev_clear(layer_fb); - pl_vout_buf = vout_fbdev_resize(layer_fb, w, h, bpp, 0, 0, 0, 0, 3); -#elif defined(MAEMO) - extern void *hildon_set_mode(int w, int h); - pl_vout_buf = hildon_set_mode(w, h); -#endif + update_layer_size(pl_vout_w, pl_vout_h); - if (pl_vout_buf == NULL) - fprintf(stderr, "failed to set mode\n"); + pl_vout_buf = plat_gvideo_set_mode(&pl_vout_w, &pl_vout_h, &pl_vout_bpp); + 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 decides on layer size, we commit it - menu_notify_mode_change(w, h, bpp); - omap_enable_layer(1); + menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp); return pl_vout_buf; } +// only used if raw flip is not defined static void *pl_vout_flip(void) { pl_rearmed_cbs.flip_cnt++; if (pl_vout_buf != NULL) - pl_print_hud(pl_vout_w, pl_vout_h, 0); + pl_print_hud(0); // let's flip now -#if defined(VOUT_FBDEV) - pl_vout_buf = vout_fbdev_flip(layer_fb); -#elif defined(MAEMO) - extern void *hildon_flip(void); - pl_vout_buf = hildon_flip(); -#endif + pl_vout_buf = plat_gvideo_flip(); return pl_vout_buf; } static int pl_vout_open(void) { struct timeval now; + int h; - omap_enable_layer(1); -#if defined(VOUT_FBDEV) // force mode update - int h = pl_vout_h; - pl_vout_h--; - pl_vout_buf = pl_vout_set_mode(pl_vout_w, h, pl_vout_bpp); - - // try to align redraws to vsync - vout_fbdev_wait_vsync(layer_fb); -#elif defined(MAEMO) - extern void *hildon_flip(void); - pl_vout_buf = hildon_flip(); -#endif + h = psx_h; + psx_h--; + pl_vout_buf = pl_vout_set_mode(psx_w, h, psx_bpp); + + plat_gvideo_open(is_pal); gettimeofday(&now, 0); vsync_usec_time = now.tv_usec; @@ -206,20 +246,20 @@ static int pl_vout_open(void) static void pl_vout_close(void) { - omap_enable_layer(0); + plat_gvideo_close(); } void *pl_prepare_screenshot(int *w, int *h, int *bpp) { -#if defined(VOUT_FBDEV) + void *ret = plat_prepare_screenshot(w, h, bpp); + if (ret != NULL) + return ret; + *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 } #ifndef MAEMO @@ -384,12 +424,13 @@ void pl_frame_limit(void) 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; @@ -510,8 +551,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();