From 7c980acd325ee6a95f28b9961fedad66bcf3f042 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Mon, 5 Dec 2022 10:31:47 -0700 Subject: [PATCH] update parallel rdp --- parallel-rdp-standalone/gfx_simple64.c | 9 +++++++-- parallel-rdp-standalone/parallel_imp.cpp | 4 ---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/parallel-rdp-standalone/gfx_simple64.c b/parallel-rdp-standalone/gfx_simple64.c index e041fc9..61f067d 100644 --- a/parallel-rdp-standalone/gfx_simple64.c +++ b/parallel-rdp-standalone/gfx_simple64.c @@ -157,7 +157,7 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle _CoreLibHandle, void *Co ConfigOpenSection("Video-Parallel", &configVideoParallel); ConfigSetDefaultBool(configVideoParallel, KEY_FULLSCREEN, 0, "Use fullscreen mode if True, or windowed mode if False"); - ConfigSetDefaultInt(configVideoParallel, KEY_UPSCALING, 1, "Amount of rescaling: 1=None, 2=2x, 4=4x, 8=8x"); + ConfigSetDefaultInt(configVideoParallel, KEY_UPSCALING, 1, "Amount of rescaling: 1=None, 2=2x, 4=4x"); ConfigSetDefaultBool(configVideoParallel, KEY_VSYNC, 0, "Enable VSync"); ConfigSetDefaultInt(configVideoParallel, KEY_SCREEN_WIDTH, 640, "Screen width"); ConfigSetDefaultInt(configVideoParallel, KEY_SCREEN_HEIGHT, 480, "Screen height"); @@ -268,9 +268,14 @@ EXPORT int CALL RomOpen(void) else window_vsync = ConfigGetParamBool(configVideoParallel, KEY_VSYNC); vk_rescaling = ConfigGetParamInt(configVideoParallel, KEY_UPSCALING); + if (vk_rescaling > 4 ) + vk_rescaling = 4; + else if (vk_rescaling == 3) + vk_rescaling = 2; + else if (vk_rescaling < 1) + vk_rescaling = 1; vk_ssreadbacks = ConfigGetParamBool(configVideoParallel, KEY_SSREADBACKS); vk_ssdither = ConfigGetParamBool(configVideoParallel, KEY_SSDITHER); - vk_divot_filter = ConfigGetParamBool(configVideoParallel, KEY_DIVOT); vk_gamma_dither = ConfigGetParamBool(configVideoParallel, KEY_GAMMADITHER); vk_vi_scale = ConfigGetParamBool(configVideoParallel, KEY_VIBILERP); diff --git a/parallel-rdp-standalone/parallel_imp.cpp b/parallel-rdp-standalone/parallel_imp.cpp index f70ef61..ebbeb07 100644 --- a/parallel-rdp-standalone/parallel_imp.cpp +++ b/parallel-rdp-standalone/parallel_imp.cpp @@ -487,10 +487,6 @@ bool vk_init() case 4: flags |= RDP::COMMAND_PROCESSOR_FLAG_UPSCALING_4X_BIT; break; - case 8: - flags |= RDP::COMMAND_PROCESSOR_FLAG_UPSCALING_8X_BIT; - break; - default: break; }