diff --git a/Common/GPU/Vulkan/VulkanLoader.cpp b/Common/GPU/Vulkan/VulkanLoader.cpp index ab0f6633a9..95c1bfa1d7 100644 --- a/Common/GPU/Vulkan/VulkanLoader.cpp +++ b/Common/GPU/Vulkan/VulkanLoader.cpp @@ -379,12 +379,12 @@ void VulkanSetAvailable(bool available) { } bool VulkanMayBeAvailable() { -#if PPSSPP_PLATFORM(IOS_APP_STORE) +#if PPSSPP_PLATFORM(IOS) g_vulkanAvailabilityChecked = true; - g_vulkanMayBeAvailable = true; - return true; + g_vulkanMayBeAvailable = System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 13; + INFO_LOG(SYSTEM, "VulkanMayBeAvailable: Detected version: %d", System_GetPropertyInt(SYSPROP_SYSTEMVERSION)); + return g_vulkanMayBeAvailable; #else - // Unsupported in VR at the moment if (IsVREnabled()) { return false; diff --git a/Core/Config.cpp b/Core/Config.cpp index 77f5cb3bcd..83a76ac3ce 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -515,7 +515,7 @@ int Config::NextValidBackend() { return iGPUBackend; } -bool Config::IsBackendEnabled(GPUBackend backend, bool validate) { +bool Config::IsBackendEnabled(GPUBackend backend) { std::vector split; SplitString(sDisabledGPUBackends, ',', split); @@ -534,10 +534,8 @@ bool Config::IsBackendEnabled(GPUBackend backend, bool validate) { if (backend != GPUBackend::OPENGL) return false; #elif PPSSPP_PLATFORM(WINDOWS) - if (validate) { - if (backend == GPUBackend::DIRECT3D11 && !DoesVersionMatchWindows(6, 0, 0, 0, true)) - return false; - } + if (backend == GPUBackend::DIRECT3D11 && !DoesVersionMatchWindows(6, 0, 0, 0, true)) + return false; #else if (backend == GPUBackend::DIRECT3D11 || backend == GPUBackend::DIRECT3D9) return false; @@ -547,11 +545,9 @@ bool Config::IsBackendEnabled(GPUBackend backend, bool validate) { if (backend == GPUBackend::OPENGL) return false; #endif - if (validate) { - if (backend == GPUBackend::VULKAN && !VulkanMayBeAvailable()) - return false; - } - + INFO_LOG(SYSTEM, "Checking for VK"); + if (backend == GPUBackend::VULKAN && !VulkanMayBeAvailable()) + return false; return true; } diff --git a/Core/Config.h b/Core/Config.h index 61a30c5d5a..7f545a3b57 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -602,7 +602,7 @@ public: bool IsPortrait() const; int NextValidBackend(); - bool IsBackendEnabled(GPUBackend backend, bool validate = true); + bool IsBackendEnabled(GPUBackend backend); bool UseFullScreen() const { if (iForceFullScreen != -1) diff --git a/ios/MoltenVK b/ios/MoltenVK index ad018e8664..0bf904d2d1 160000 --- a/ios/MoltenVK +++ b/ios/MoltenVK @@ -1 +1 @@ -Subproject commit ad018e8664d343dd1e6d7a6ce712c64a6f8fee2a +Subproject commit 0bf904d2d1d159eb95bdefcd8432eee79ee1da14 diff --git a/ios/README.md b/ios/README.md index 1db38a22a6..26096a6d60 100644 --- a/ios/README.md +++ b/ios/README.md @@ -1,3 +1,7 @@ +Updating with a self-built MoltenVK +=================================== +cp -r ../dev/build-molten/MoltenVK/Package/Release/MoltenVK/static/MoltenVK.xcframework ios/MoltenVK + The Old iOS Build Instructions ============================== diff --git a/ios/main.mm b/ios/main.mm index f0de32c996..9f1dcded49 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -561,7 +561,7 @@ int main(int argc, char *argv[]) { // SetCurrentThreadName("MainThread"); version = [[[UIDevice currentDevice] systemVersion] UTF8String]; - if (2 != sscanf(version.c_str(), "%d", &g_iosVersionMajor)) { + if (1 != sscanf(version.c_str(), "%d", &g_iosVersionMajor)) { // Just set it to 14.0 if the parsing fails for whatever reason. g_iosVersionMajor = 14; }