From ea4a16e7665cf6b4a68f5c017b346547d6455470 Mon Sep 17 00:00:00 2001 From: notaz Date: Thu, 15 Sep 2011 01:33:57 +0300 Subject: [PATCH] add fixed frameskip option --- frontend/main.c | 11 ++++++++--- frontend/menu.c | 13 +++++++++---- plugins/dfxvideo/gpu.c | 2 +- plugins/gpu_neon/gpu.c | 4 ++-- plugins/gpu_neon/gpu.h | 2 +- plugins/gpu_neon/vout_fb.c | 8 +++++--- plugins/gpu_unai/gpu.cpp | 2 +- 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/frontend/main.c b/frontend/main.c index c5520cf9..498e7806 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -171,9 +171,14 @@ void do_emu_action(void) state_slot = 9; goto do_state_slot; case SACTION_TOGGLE_FSKIP: - pl_rearmed_cbs.frameskip ^= 1; - snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s", - pl_rearmed_cbs.frameskip ? "ON" : "OFF"); + pl_rearmed_cbs.fskip_advice = 0; + pl_rearmed_cbs.frameskip++; + if (pl_rearmed_cbs.frameskip > 1) + pl_rearmed_cbs.frameskip = -1; + snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP: %s", + pl_rearmed_cbs.frameskip == -1 ? "AUTO" : + pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" ); + plugin_call_rearmed_cbs(); break; case SACTION_SCREENSHOT: { diff --git a/frontend/menu.c b/frontend/menu.c index 45e9d5db..a627ffe7 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -71,7 +71,7 @@ enum { }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost; +static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; static int warned_about_bios, region, in_type_sel1, in_type_sel2; @@ -160,6 +160,7 @@ static void menu_sync_config(void) } iVolume = 768 + 128 * volume_boost; + pl_rearmed_cbs.frameskip = frameskip - 1; pl_timing_prepare(Config.PsxType); } @@ -168,6 +169,7 @@ static void menu_set_defconfig(void) g_opts = 0; scaling = SCALE_4_3; volume_boost = 0; + frameskip = 0; region = 0; in_type_sel1 = in_type_sel2 = 0; @@ -176,7 +178,6 @@ static void menu_set_defconfig(void) Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; Config.CdrReschedule = 0; - pl_rearmed_cbs.frameskip = 0; pl_rearmed_cbs.gpu_peops.iUseDither = 0; pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; pl_rearmed_cbs.gpu_unai.abe_hack = @@ -211,6 +212,9 @@ static void menu_set_defconfig(void) #define CE_INTVAL_V(val, ver) \ { #val #ver, sizeof(val), &val } +#define CE_INTVAL_PV(val, ver) \ + { #val #ver, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val } + static const struct { const char *name; size_t len; @@ -243,7 +247,7 @@ static const struct { CE_INTVAL(g_opts), CE_INTVAL(in_type_sel1), CE_INTVAL(in_type_sel2), - CE_INTVAL_P(frameskip), + CE_INTVAL_V(frameskip, 2), CE_INTVAL_P(gpu_peops.iUseDither), CE_INTVAL_P(gpu_peops.dwActFixes), CE_INTVAL_P(gpu_unai.abe_hack), @@ -1252,6 +1256,7 @@ static int mh_restore_defaults(int id, int keys) } static const char *men_region[] = { "Auto", "NTSC", "PAL", NULL }; +static const char *men_frameskip[] = { "Auto", "Off", "1", NULL }; /* static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL }; static const char h_confirm_save[] = "Ask for confirmation when overwriting save,\n" @@ -1265,7 +1270,7 @@ static menu_entry e_menu_options[] = { // mee_range ("Save slot", 0, state_slot, 0, 9), // mee_enum_h ("Confirm savestate", 0, dummy, men_confirm_save, h_confirm_save), - mee_onoff_h ("Frameskip", 0, pl_rearmed_cbs.frameskip, 1, h_frameskip), + mee_enum_h ("Frameskip", 0, frameskip, men_frameskip, h_frameskip), mee_onoff ("Show FPS", 0, g_opts, OPT_SHOWFPS), mee_enum ("Region", 0, region, men_region), mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000), diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index 6af6447d..d80a265c 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -233,7 +233,7 @@ static void decideSkip(void) if(dwActFixes&0xa0) // -> pc fps calculation fix/old skipping fix { - int skip = (skip_advice && *skip_advice) || fps_skip < fFrameRateHz; + int skip = (skip_advice && *skip_advice) || UseFrameSkip == 1 || fps_skip < fFrameRateHz; if(skip && !bSkipNextFrame) // -> skip max one in a row {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;} else bSkipNextFrame = FALSE; diff --git a/plugins/gpu_neon/gpu.c b/plugins/gpu_neon/gpu.c index 03b0c71b..c275d834 100644 --- a/plugins/gpu_neon/gpu.c +++ b/plugins/gpu_neon/gpu.c @@ -61,7 +61,7 @@ static noinline void decide_frameskip(void) { gpu.frameskip.frame_ready = !gpu.frameskip.active; - if (!gpu.frameskip.active && *gpu.frameskip.advice) + if (!gpu.frameskip.active && (*gpu.frameskip.advice || gpu.frameskip.set == 1)) gpu.frameskip.active = 1; else gpu.frameskip.active = 0; @@ -133,7 +133,7 @@ void GPUwriteStatus(uint32_t data) case 0x05: gpu.screen.x = data & 0x3ff; gpu.screen.y = (data >> 10) & 0x3ff; - if (gpu.frameskip.enabled) + if (gpu.frameskip.set) decide_frameskip(); break; case 0x06: diff --git a/plugins/gpu_neon/gpu.h b/plugins/gpu_neon/gpu.h index a0cdbf74..04f69ab8 100644 --- a/plugins/gpu_neon/gpu.h +++ b/plugins/gpu_neon/gpu.h @@ -71,7 +71,7 @@ struct psx_gpu { } last_list; } state; struct { - uint32_t enabled:1; + int32_t set:3; /* -1 auto, 0 off, 1 fixed */ uint32_t active:1; uint32_t frame_ready:1; uint32_t skipped_blits:5; diff --git a/plugins/gpu_neon/vout_fb.c b/plugins/gpu_neon/vout_fb.c index b2b5b250..6b687b30 100644 --- a/plugins/gpu_neon/vout_fb.c +++ b/plugins/gpu_neon/vout_fb.c @@ -84,7 +84,7 @@ void GPUupdateLace(void) if (gpu.status.blanking || !gpu.state.fb_dirty) return; - if (gpu.frameskip.enabled) { + if (gpu.frameskip.set) { if (!gpu.frameskip.frame_ready && gpu.frameskip.skipped_blits < 9) { gpu.frameskip.skipped_blits++; return; @@ -100,8 +100,6 @@ void GPUupdateLace(void) long GPUopen(void) { - gpu.frameskip.enabled = cbs->frameskip; - gpu.frameskip.advice = &cbs->fskip_advice; gpu.frameskip.active = 0; gpu.frameskip.frame_ready = 1; @@ -119,6 +117,10 @@ long GPUclose(void) void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_) { cbs = cbs_; + gpu.frameskip.set = cbs->frameskip; + gpu.frameskip.advice = &cbs->fskip_advice; + gpu.frameskip.active = 0; + gpu.frameskip.frame_ready = 1; } // vim:shiftwidth=2:expandtab diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp index fefc2773..3342d1ee 100644 --- a/plugins/gpu_unai/gpu.cpp +++ b/plugins/gpu_unai/gpu.cpp @@ -901,7 +901,7 @@ void GPU_updateLace(void) wasSkip = isSkip = 0; } - skipFrame = cbs->fskip_advice; + skipFrame = cbs->fskip_advice || cbs->frameskip == 1; } long GPUopen(unsigned long *, char *, char *) -- 2.39.5