From 6b2fe16a1b6ae04a53620ee8e67d8bbb903b06be Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Sun, 19 Nov 2017 14:33:16 +0100 Subject: [PATCH] Move SimpleUI to main screen, +some config cleaning. --- Core/Config.cpp | 8 ++++---- UI/GameSettingsScreen.cpp | 12 ++++-------- UI/MainScreen.cpp | 1 + ext/native/thin3d/VulkanRenderManager.cpp | 6 ++++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index f100a59751..08e609aa5c 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -408,7 +408,7 @@ static bool DefaultSasThread() { static ConfigSetting cpuSettings[] = { ReportedConfigSetting("CPUCore", &g_Config.iCpuCore, &DefaultCpuCore, true, true), - ConfigSetting("VulkanMultithreading", &g_Config.bVulkanMultithreading, true, true, true), + ConfigSetting("VulkanMultithreading", &g_Config.bVulkanMultithreading, false, true, true), ReportedConfigSetting("SeparateSASThread", &g_Config.bSeparateSASThread, &DefaultSasThread, true, true), ReportedConfigSetting("SeparateIOThread", &g_Config.bSeparateIOThread, true, true, true), ReportedConfigSetting("IOTimingMethod", &g_Config.iIOTimingMethod, IOTIMING_REALISTIC, true, true), @@ -742,7 +742,7 @@ static ConfigSetting systemParamSettings[] = { ReportedConfigSetting("PSPModel", &g_Config.iPSPModel, &DefaultPSPModel, true, true), ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE, true, true), ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP", true, true), - ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "", true, true), + ConfigSetting("proAdhocServer", &g_Config.proAdhocServer, "localhost", true, true), ConfigSetting("MacAddress", &g_Config.sMACAddress, "", true, true), ConfigSetting("PortOffset", &g_Config.iPortOffset, 0, true, true), ReportedConfigSetting("Language", &g_Config.iLanguage, &DefaultSystemParamLanguage, true, true), @@ -931,12 +931,12 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { LogManager::GetInstance()->LoadConfig(log, debugDefaults); IniFile::Section *recent = iniFile.GetOrCreateSection("Recent"); - recent->Get("MaxRecent", &iMaxRecent, 30); + recent->Get("MaxRecent", &iMaxRecent, 1000); // Fix issue from switching from uint (hex in .ini) to int (dec) // -1 is okay, though. We'll just ignore recent stuff if it is. if (iMaxRecent == 0) - iMaxRecent = 30; + iMaxRecent = 1000; if (iMaxRecent > 0) { recentIsos.clear(); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 535318ad7c..8af8f31b72 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -675,15 +675,10 @@ void GameSettingsScreen::CreateViews() { systemSettings->Add(new CheckBox(&g_Config.bFastMemory, sy->T("Fast Memory", "Fast Memory (Unstable)")))->OnClick.Handle(this, &GameSettingsScreen::OnJitAffectingSetting); - if (g_Config.iGPUBackend == GPU_BACKEND_VULKAN) - systemSettings->Add(new CheckBox(&g_Config.bVulkanMultithreading, sy->T("Vulkan Multithreading", "Vulkan Multithreading"))); - systemSettings->Add(new CheckBox(&g_Config.bSeparateIOThread, sy->T("I/O on thread (experimental)")))->SetEnabled(!PSP_IsInited()); static const char *ioTimingMethods[] = { "Fast (lag on slow storage)", "Host (bugs, less lag)", "Simulate UMD delays" }; View *ioTimingMethod = systemSettings->Add(new PopupMultiChoice(&g_Config.iIOTimingMethod, sy->T("IO timing method"), ioTimingMethods, 0, ARRAY_SIZE(ioTimingMethods), sy->GetName(), screenManager())); ioTimingMethod->SetEnabledPtr(&g_Config.bSeparateIOThread); - PopupSliderChoice *manualUMDDelay = systemSettings->Add(new PopupSliderChoice(&g_Config.iIOManualDelay, 1, 20, sy->T("Slow down simulated UMD delays", "Slow down simulated UMD delays"), screenManager(), sy->T("Multiplier"))); - manualUMDDelay->SetEnabledPtr(&g_Config.bSeparateIOThread); systemSettings->Add(new CheckBox(&g_Config.bForceLagSync, sy->T("Force real clock sync (slower, less lag)"))); PopupSliderChoice *lockedMhz = systemSettings->Add(new PopupSliderChoice(&g_Config.iLockedCPUSpeed, 0, 1000, sy->T("Change CPU Clock", "Change CPU Clock (unstable)"), screenManager(), sy->T("MHz, 0:default"))); lockedMhz->SetZeroLabel(sy->T("Auto")); @@ -705,7 +700,6 @@ void GameSettingsScreen::CreateViews() { } } #endif - systemSettings->Add(new CheckBox(&g_Config.bSimpleUI, sy->T("SimpleUI", "Hide advanced/rarely used settings")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguageChange); if (!g_Config.bSimpleUI) { systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); if (g_Config.iMaxRecent > 0) @@ -804,8 +798,10 @@ void GameSettingsScreen::CreateViews() { systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sNickName, sy->T("Change Nickname"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname); #endif #if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE)) - // Screenshot functionality is not yet available on non-Windows/non-Qt - systemSettings->Add(new CheckBox(&g_Config.bScreenshotsAsPNG, sy->T("Screenshots as PNG"))); + if (!g_Config.bSimpleUI) { + // Screenshot functionality is not yet available on non-Windows/non-Qt + systemSettings->Add(new CheckBox(&g_Config.bScreenshotsAsPNG, sy->T("Screenshots as PNG"))); + } systemSettings->Add(new CheckBox(&g_Config.bDumpFrames, sy->T("Record Display"))); systemSettings->Add(new CheckBox(&g_Config.bUseFFV1, sy->T("Use Lossless Video Codec (FFV1)"))); systemSettings->Add(new CheckBox(&g_Config.bDumpAudio, sy->T("Record Audio"))); diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 36b93ded70..fcfa3488da 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -853,6 +853,7 @@ void MainScreen::CreateViews() { #endif rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); + rightColumnItems->Add(new CheckBox(&g_Config.bSimpleUI, mm->T("SimpleUI", "Simple UI")))->OnClick.Handle(this, &MainScreen::OnRecentChange); if (!g_Config.bSimpleUI) { rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); if (!System_GetPropertyBool(SYSPROP_APP_GOLD)) { diff --git a/ext/native/thin3d/VulkanRenderManager.cpp b/ext/native/thin3d/VulkanRenderManager.cpp index e2bfd9369e..3898062c13 100644 --- a/ext/native/thin3d/VulkanRenderManager.cpp +++ b/ext/native/thin3d/VulkanRenderManager.cpp @@ -127,8 +127,10 @@ VulkanRenderManager::VulkanRenderManager(VulkanContext *vulkan) : vulkan_(vulkan queueRunner_.CreateDeviceObjects(); // Temporary AMD hack for issue #10097 - if (!g_Config.bVulkanMultithreading) { - useThread_ = false; + if (vulkan_->GetPhysicalDeviceProperties().vendorID == VULKAN_VENDOR_AMD) { + if (!g_Config.bVulkanMultithreading) { + useThread_ = false; + } } }