From 4924b22b511f0badfce97d9d6703a80c1c718a3c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 21 Aug 2022 19:00:10 -0700 Subject: [PATCH 1/3] Linux: Consider Vulkan if OpenGL init fails. --- Core/Config.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 4c5d312bf2..e7ec5d1e5a 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -748,7 +748,7 @@ int Config::NextValidBackend() { if (failed.count((GPUBackend)iGPUBackend)) { ERROR_LOG(LOADER, "Graphics backend failed for %d, trying another", iGPUBackend); -#if (PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(ANDROID)) && !PPSSPP_PLATFORM(UWP) +#if !PPSSPP_PLATFORM(UWP) if (!failed.count(GPUBackend::VULKAN) && VulkanMayBeAvailable()) { return (int)GPUBackend::VULKAN; } @@ -797,6 +797,9 @@ bool Config::IsBackendEnabled(GPUBackend backend, bool validate) { #if PPSSPP_PLATFORM(UWP) if (backend != GPUBackend::DIRECT3D11) return false; +#elif PPSSPP_PLATFORM(SWITCH) + if (backend != GPUBackend::OPENGL) + return false; #elif PPSSPP_PLATFORM(WINDOWS) if (validate) { if (backend == GPUBackend::DIRECT3D11 && !DoesVersionMatchWindows(6, 0, 0, 0, true)) From 842bf86b1a6c8315cf4675549f55f77d03b06d59 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 21 Aug 2022 19:05:51 -0700 Subject: [PATCH 2/3] Config: Default PSP model to SLIM on all platforms. --- Core/Config.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index e7ec5d1e5a..1949ecf426 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1116,15 +1116,6 @@ static ConfigSetting networkSettings[] = { ConfigSetting(false), }; -static int DefaultPSPModel() { - // TODO: Can probably default this on, but not sure about its memory differences. -#if !PPSSPP_ARCH(AMD64) && !defined(_WIN32) - return PSP_MODEL_FAT; -#else - return PSP_MODEL_SLIM; -#endif -} - static int DefaultSystemParamLanguage() { int defaultLang = PSP_SYSTEMPARAM_LANGUAGE_ENGLISH; if (g_Config.bFirstRun) { @@ -1138,7 +1129,7 @@ static int DefaultSystemParamLanguage() { } static ConfigSetting systemParamSettings[] = { - ReportedConfigSetting("PSPModel", &g_Config.iPSPModel, &DefaultPSPModel, true, true), + ReportedConfigSetting("PSPModel", &g_Config.iPSPModel, PSP_MODEL_SLIM, true, true), ReportedConfigSetting("PSPFirmwareVersion", &g_Config.iFirmwareVersion, PSP_DEFAULT_FIRMWARE, true, true), ConfigSetting("NickName", &g_Config.sNickName, "PPSSPP", true, true), ConfigSetting("MacAddress", &g_Config.sMACAddress, "", true, true), From c13f57e64f02fb429b1a95ef33f0795db8b2aa11 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 21 Aug 2022 19:40:02 -0700 Subject: [PATCH 3/3] Vulkan: Cleanup minor logging. --- Common/GPU/Vulkan/VulkanContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp index 23a854dd8e..1a938a5235 100644 --- a/Common/GPU/Vulkan/VulkanContext.cpp +++ b/Common/GPU/Vulkan/VulkanContext.cpp @@ -684,7 +684,7 @@ VkResult VulkanContext::CreateDevice() { } else { VulkanLoadDeviceFunctions(device_, extensionsLookup_); } - INFO_LOG(G3D, "Device created.\n"); + INFO_LOG(G3D, "Vulkan Device created"); VulkanSetAvailable(true); VmaAllocatorCreateInfo allocatorInfo = {};