From 0a4dc1f88381f64c42f417b6dacfcb13971821b1 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Sat, 24 Mar 2018 16:21:34 +0100 Subject: [PATCH 1/6] Remove "sound speed hack". --- Core/Config.cpp | 1 - Core/Config.h | 3 --- Core/HW/SimpleAudioDec.cpp | 12 +++--------- UI/GameSettingsScreen.cpp | 3 --- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index f1805dab3b..25355866f0 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -673,7 +673,6 @@ static ConfigSetting soundSettings[] = { ConfigSetting("AudioBackend", &g_Config.iAudioBackend, 0, true, true), ConfigSetting("AudioLatency", &g_Config.iAudioLatency, 1, true, true), ConfigSetting("ExtraAudioBuffering", &g_Config.bExtraAudioBuffering, false, true, false), - ConfigSetting("SoundSpeedHack", &g_Config.bSoundSpeedHack, false, true, true), ConfigSetting("AudioResampler", &g_Config.bAudioResampler, true, true, true), ConfigSetting("GlobalVolume", &g_Config.iGlobalVolume, VOLUME_MAX, true, true), diff --git a/Core/Config.h b/Core/Config.h index a45080ff0e..06f92f6618 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -201,9 +201,6 @@ public: int iGlobalVolume; bool bExtraAudioBuffering; // For bluetooth - // Audio Hack - bool bSoundSpeedHack; - // UI bool bShowDebuggerOnLoad; int iShowFPSCounter; diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index 05d36541f8..f9ccbbe745 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -330,15 +330,8 @@ u32 AuCtx::AuDecode(u32 pcmAddr) memset(outbuf, 0, PCMBufSize); // important! empty outbuf to avoid noise u32 outpcmbufsize = 0; - int repeat = 1; - if (g_Config.bSoundSpeedHack){ - repeat = 2; - } - int i = 0; - // decode frames in sourcebuff and output into PCMBuf (each time, we decode one or two frames) - // some games as Miku like one frame each time, some games like DOA like two frames each time - while (sourcebuff.size() > 0 && outpcmbufsize < PCMBufSize && i < repeat){ - i++; + // decode frames in sourcebuff and output into PCMBuf, making sure it's filled + while (sourcebuff.size() > 0 && outpcmbufsize < PCMBufSize) { int pcmframesize; // decode decoder->Decode((void*)sourcebuff.c_str(), (int)sourcebuff.size(), outbuf, &pcmframesize); @@ -367,6 +360,7 @@ u32 AuCtx::AuDecode(u32 pcmAddr) outbuf += pcmframesize; // increase FrameNum count FrameNum++; + break; } Memory::Write_U32(PCMBuf, pcmAddr); return outpcmbufsize; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index cb1c80fdc1..063b2b7434 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -514,9 +514,6 @@ void GameSettingsScreen::CreateViews() { resampling->SetEnabledPtr(&g_Config.bEnableSound); } - audioSettings->Add(new ItemHeader(a->T("Audio hacks"))); - audioSettings->Add(new CheckBox(&g_Config.bSoundSpeedHack, a->T("Sound speed hack (DOA etc.)"))); - // Control ViewGroup *controlsSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); controlsSettingsScroll->SetTag("GameSettingsControls"); From 751ddf6fa2c92786ce8dbe881f0a0fa858742596 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Thu, 25 Apr 2019 04:17:54 +0200 Subject: [PATCH 2/6] Hopefully fix the annoying LR. --- libretro/libretro.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index a267c8a225..7b0f2bb493 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -185,7 +185,6 @@ static RetroOption ppsspp_gpu_hardware_transform("ppsspp_gpu_hardware_tran static RetroOption ppsspp_vertex_cache("ppsspp_vertex_cache", "Vertex Cache (Speedhack)", true); static RetroOption ppsspp_separate_io_thread("ppsspp_separate_io_thread", "IO Threading", false); static RetroOption ppsspp_unsafe_func_replacements("ppsspp_unsafe_func_replacements", "Unsafe FuncReplacements", true); -static RetroOption ppsspp_sound_speedhack("ppsspp_sound_speedhack", "Sound Speedhack", false); static RetroOption ppsspp_cheats("ppsspp_cheats", "Internal Cheats Support", false); static RetroOption ppsspp_io_timing_method("ppsspp_io_timing_method", "IO Timing Method", { { "Fast", IOTimingMethods::IOTIMING_FAST }, { "Host", IOTimingMethods::IOTIMING_HOST }, { "Simulate UMD delays", IOTimingMethods::IOTIMING_REALISTIC } }); @@ -213,7 +212,6 @@ void retro_set_environment(retro_environment_t cb) { vars.push_back(ppsspp_vertex_cache.GetOptions()); vars.push_back(ppsspp_separate_io_thread.GetOptions()); vars.push_back(ppsspp_unsafe_func_replacements.GetOptions()); - vars.push_back(ppsspp_sound_speedhack.GetOptions()); vars.push_back(ppsspp_cheats.GetOptions()); vars.push_back(ppsspp_io_timing_method.GetOptions()); vars.push_back({}); @@ -278,7 +276,6 @@ static void check_variables(CoreParameter &coreParam) { ppsspp_texture_replacement.Update(&g_Config.bReplaceTextures); ppsspp_separate_io_thread.Update(&g_Config.bSeparateIOThread); ppsspp_unsafe_func_replacements.Update(&g_Config.bFuncReplacements); - ppsspp_sound_speedhack.Update(&g_Config.bSoundSpeedHack); ppsspp_cheats.Update(&g_Config.bEnableCheats); ppsspp_locked_cpu_speed.Update(&g_Config.iLockedCPUSpeed); ppsspp_rendering_mode.Update(&g_Config.iRenderingMode); From 280f7fec397866ce4b982ac344c0cb8cf628b6a1 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Thu, 25 Apr 2019 23:45:25 +0200 Subject: [PATCH 3/6] Fix VS2019 builds and remove _xp dependency (drops Win XP support, allows latest SDK etc.) --- Common/Common.vcxproj | 13 +++++----- Core/Core.vcxproj | 11 ++++----- GPU/GPU.vcxproj | 29 +++++++++++------------ UI/UI.vcxproj | 11 ++++----- Windows/PPSSPP.vcxproj | 29 +++++++++++------------ ext/SPIRV-Cross.vcxproj | 11 ++++----- ext/discord-rpc-build/discord-rpc.vcxproj | 11 ++++----- ext/glslang.vcxproj | 10 ++++---- ext/libarmips.vcxproj | 15 ++++++------ ext/libkirk/libkirk.vcxproj | 13 +++++----- ext/native/native.vcxproj | 13 +++++----- ext/zlib/zlib.vcxproj | 13 +++++----- headless/Headless.vcxproj | 29 +++++++++++------------ unittest/UnitTests.vcxproj | 19 +++++++-------- 14 files changed, 107 insertions(+), 120 deletions(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 6200675522..343f4c8e83 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -22,33 +22,32 @@ {3FCDBAE2-5103-4350-9A8E-848CE9C73195} Win32Proj Common - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -331,4 +330,4 @@ - + \ No newline at end of file diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 51af34e22f..307121db06 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -21,34 +21,33 @@ {533F1D30-D04D-47CC-AD71-20F658907E36} Core - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 9354e28bc5..7f305cd305 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -21,34 +21,33 @@ {457F45D2-556F-47BC-A31D-AFF0D15BEAED} GPU - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -67,20 +66,20 @@ - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -390,4 +389,4 @@ - + \ No newline at end of file diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 935362f6b6..05114fd522 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -93,33 +93,32 @@ {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F} Win32Proj UI - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 27a423df46..64d26f8afd 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -23,30 +23,29 @@ DaSh Win32Proj PPSSPPWindows - - + 10.0 Application Unicode false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -98,25 +97,25 @@ ..\ PPSSPPDebug false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); PPSSPPDebug64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); PPSSPPWindows64 false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -587,4 +586,4 @@ - + \ No newline at end of file diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj index 3e1003593c..3caf3bb8d6 100644 --- a/ext/SPIRV-Cross.vcxproj +++ b/ext/SPIRV-Cross.vcxproj @@ -22,32 +22,31 @@ {4328A62C-F1E9-47ED-B816-A1A81DAF4363} Win32Proj SPIRVCross - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj b/ext/discord-rpc-build/discord-rpc.vcxproj index 0ef8d3d62a..0eaa3fb2f6 100644 --- a/ext/discord-rpc-build/discord-rpc.vcxproj +++ b/ext/discord-rpc-build/discord-rpc.vcxproj @@ -41,32 +41,31 @@ {BEB0A821-3C7F-410F-A525-63AFBC69BF8F} Win32Proj discordrpc - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj index 2d3af8be1d..d0287c12de 100644 --- a/ext/glslang.vcxproj +++ b/ext/glslang.vcxproj @@ -22,31 +22,31 @@ {EDFA2E87-8AC1-4853-95D4-D7594FF81947} Win32Proj glslang - 7.0 + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index 411af13881..f9aee07e19 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -30,45 +30,44 @@ {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25} Win32Proj libarmips - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj index c26a53464b..768034b8cb 100644 --- a/ext/libkirk/libkirk.vcxproj +++ b/ext/libkirk/libkirk.vcxproj @@ -21,33 +21,32 @@ {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE} libkirk - - + 10.0 StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode StaticLibrary false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode @@ -160,4 +159,4 @@ - + \ No newline at end of file diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index ba5a926d8b..ff2f8b9a50 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -22,34 +22,33 @@ {C4DF647E-80EA-4111-A0A8-218B1B711E18} Win32Proj native - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -773,4 +772,4 @@ - + \ No newline at end of file diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj index 6595864711..4f6f13cddc 100644 --- a/ext/zlib/zlib.vcxproj +++ b/ext/zlib/zlib.vcxproj @@ -52,34 +52,33 @@ {F761046E-6C38-4428-A5F1-38391A37BB34} Win32Proj zlib - - + 10.0 StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) StaticLibrary false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -196,4 +195,4 @@ - + \ No newline at end of file diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index f2c47e75ad..258dc0056d 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -23,34 +23,33 @@ Win32Proj Headless PPSSPPHeadless - - + 10.0 Application true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application true Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Application false Unicode - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) @@ -70,23 +69,23 @@ true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); true - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); false - ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); @@ -281,4 +280,4 @@ - + \ No newline at end of file diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index fa377805f9..adac87cddc 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -23,33 +23,32 @@ Win32Proj UnitTests UnitTest - - + 10.0 Application true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode Application true - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode Application false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) false Unicode Application false - $(DefaultPlatformToolset)_xp + $(DefaultPlatformToolset) Unicode @@ -70,19 +69,19 @@ true - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); true - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); false - ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); + ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); false - ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64); + ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); From 056494522e710f9384880d455d73e5ac463d2989 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Sat, 27 Apr 2019 23:01:41 +0200 Subject: [PATCH 4/6] Remove default SDK version from project files --- Common/Common.vcxproj | 2 +- Core/Core.vcxproj | 2 +- GPU/GPU.vcxproj | 2 +- UI/UI.vcxproj | 2 +- Windows/PPSSPP.vcxproj | 2 +- ext/SPIRV-Cross.vcxproj | 2 +- ext/discord-rpc-build/discord-rpc.vcxproj | 2 +- ext/glslang.vcxproj | 2 +- ext/libarmips.vcxproj | 2 +- ext/libkirk/libkirk.vcxproj | 2 +- ext/native/native.vcxproj | 2 +- ext/zlib/zlib.vcxproj | 2 +- headless/Headless.vcxproj | 2 +- unittest/UnitTests.vcxproj | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 343f4c8e83..6938b73896 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -22,7 +22,7 @@ {3FCDBAE2-5103-4350-9A8E-848CE9C73195} Win32Proj Common - 10.0 + diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 307121db06..1e505e246d 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -21,7 +21,7 @@ {533F1D30-D04D-47CC-AD71-20F658907E36} Core - 10.0 + diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 7f305cd305..589d78ae7d 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -21,7 +21,7 @@ {457F45D2-556F-47BC-A31D-AFF0D15BEAED} GPU - 10.0 + diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 05114fd522..ab7e4583a5 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -93,7 +93,7 @@ {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F} Win32Proj UI - 10.0 + diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 64d26f8afd..0291adb8b7 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -23,7 +23,7 @@ DaSh Win32Proj PPSSPPWindows - 10.0 + diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj index 3caf3bb8d6..a802a23474 100644 --- a/ext/SPIRV-Cross.vcxproj +++ b/ext/SPIRV-Cross.vcxproj @@ -22,7 +22,7 @@ {4328A62C-F1E9-47ED-B816-A1A81DAF4363} Win32Proj SPIRVCross - 10.0 + diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj b/ext/discord-rpc-build/discord-rpc.vcxproj index 0eaa3fb2f6..bbf0c03363 100644 --- a/ext/discord-rpc-build/discord-rpc.vcxproj +++ b/ext/discord-rpc-build/discord-rpc.vcxproj @@ -41,7 +41,7 @@ {BEB0A821-3C7F-410F-A525-63AFBC69BF8F} Win32Proj discordrpc - 10.0 + diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj index d0287c12de..f482878cad 100644 --- a/ext/glslang.vcxproj +++ b/ext/glslang.vcxproj @@ -22,7 +22,7 @@ {EDFA2E87-8AC1-4853-95D4-D7594FF81947} Win32Proj glslang - 10.0 + diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index f9aee07e19..9bcfc4f4de 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -30,7 +30,7 @@ {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25} Win32Proj libarmips - 10.0 + diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj index 768034b8cb..3c1e3a62d4 100644 --- a/ext/libkirk/libkirk.vcxproj +++ b/ext/libkirk/libkirk.vcxproj @@ -21,7 +21,7 @@ {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE} libkirk - 10.0 + diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index ff2f8b9a50..3b5a40afd5 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -22,7 +22,7 @@ {C4DF647E-80EA-4111-A0A8-218B1B711E18} Win32Proj native - 10.0 + diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj index 4f6f13cddc..7ecc6db1f2 100644 --- a/ext/zlib/zlib.vcxproj +++ b/ext/zlib/zlib.vcxproj @@ -52,7 +52,7 @@ {F761046E-6C38-4428-A5F1-38391A37BB34} Win32Proj zlib - 10.0 + diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index 258dc0056d..0fdb7d83c4 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -23,7 +23,7 @@ Win32Proj Headless PPSSPPHeadless - 10.0 + diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index adac87cddc..a18fda2780 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -23,7 +23,7 @@ Win32Proj UnitTests UnitTest - 10.0 + From 9388a14a61418f735ad377278b2c3dee803ae899 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Sun, 28 Apr 2019 03:42:38 +0200 Subject: [PATCH 5/6] Add missing variable reset fixes #12002 --- Core/CoreTiming.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 9d9123139f..743c01dc22 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -125,6 +125,7 @@ u64 GetGlobalTimeUs() { // Adjust the calculated value to avoid overflow errors. lastGlobalTimeUs += usSinceLast; lastGlobalTimeTicks = GetTicks(); + usSinceLast = 0; } return lastGlobalTimeUs + usSinceLast; } From 53daa0d844afa57a75686fd44ba64c83cae0ba53 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Sun, 28 Apr 2019 13:02:57 +0200 Subject: [PATCH 6/6] Remove some unused code. --- Core/Config.h | 1 - UI/NativeApp.cpp | 2 -- UI/SavedataScreen.cpp | 2 -- 3 files changed, 5 deletions(-) diff --git a/Core/Config.h b/Core/Config.h index 06f92f6618..689acb51ff 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -81,7 +81,6 @@ public: bool bPauseExitsEmulator; #endif bool bPauseMenuExitsEmulator; - bool bPS3Controller; // Core bool bIgnoreBadMemAccess; diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 38e94664e6..b6e6634852 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -551,8 +551,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch fileToLog = argv[i] + strlen("--log="); if (!strncmp(argv[i], "--state=", strlen("--state=")) && strlen(argv[i]) > strlen("--state=")) stateToLoad = argv[i] + strlen("--state="); - if (!strncmp(argv[1], "--PS3", strlen("--PS3"))) - g_Config.bPS3Controller = true; #if !defined(MOBILE_DEVICE) if (!strncmp(argv[i], "--escape-exit", strlen("--escape-exit"))) g_Config.bPauseExitsEmulator = true; diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 735b57d5ed..6d5fcf65cf 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -339,8 +339,6 @@ bool SavedataBrowser::ByFilename(const UI::View *v1, const UI::View *v2) { static time_t GetTotalSize(const SavedataButton *b) { auto fileLoader = std::unique_ptr(ConstructFileLoader(b->GamePath())); - tm datetm; - bool success; switch (Identify_File(fileLoader.get())) { case IdentifiedFileType::PSP_PBP_DIRECTORY: case IdentifiedFileType::PSP_SAVEDATA_DIRECTORY: