From 13e220715efe370eb167c92194ddc2f8ced21726 Mon Sep 17 00:00:00 2001 From: kub Date: Wed, 30 Sep 2020 19:34:47 +0200 Subject: [PATCH] frontend, fix scaling option handling --- platform/common/emu.c | 2 +- platform/gizmondo/emu.c | 2 +- platform/psp/emu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/common/emu.c b/platform/common/emu.c index 04e26bf4..3377d40d 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -1214,7 +1214,7 @@ void emu_cmn_forced_frame(int no_scale, int do_emu) PicoIn.opt &= ~POPT_ALT_RENDERER; PicoIn.opt |= POPT_ACC_SPRITES; - if (!no_scale) + if (!no_scale && currentConfig.scaling) PicoIn.opt |= POPT_EN_SOFTSCALE; PicoDrawSetOutFormat(PDF_RGB555, 1); diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index fcf27125..c5478f4b 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -294,7 +294,7 @@ void pemu_forced_frame(int no_scale, int do_emu) PicoIn.opt &= ~0x10; PicoIn.opt |= POPT_ACC_SPRITES; - if (!no_scale) + if (!no_scale && currentConfig.scaling) PicoIn.opt |= POPT_EN_SOFTSCALE; currentConfig.EmuOpt |= 0x80; diff --git a/platform/psp/emu.c b/platform/psp/emu.c index 917ecc8d..e138ce8e 100644 --- a/platform/psp/emu.c +++ b/platform/psp/emu.c @@ -691,7 +691,7 @@ void pemu_forced_frame(int no_scale, int do_emu) PicoIn.opt &= ~POPT_ALT_RENDERER; PicoIn.opt |= POPT_ACC_SPRITES; - if (!no_scale) + if (!no_scale && defaultConfig.scaling) PicoIn.opt |= POPT_EN_SOFTSCALE; currentConfig.EmuOpt |= 0x80; -- 2.39.5