Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #19194 from hrydgard/vulkan-loading-fixes

Browse Source 
Use a hacked MoltenVK that can be loaded (but doesn't work) on iOS 12.
This commit is contained in:
Henrik Rydgård 2024-05-26 16:46:06 +02:00 committed by GitHub
commit 373c3f37e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Common/GPU/Vulkan/VulkanLoader.cpp
View File

@ -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;

16
Core/Config.cpp
View File

@ -515,7 +515,7 @@ int Config::NextValidBackend() {
return iGPUBackend;
}
bool Config::IsBackendEnabled(GPUBackend backend, bool validate) {
bool Config::IsBackendEnabled(GPUBackend backend) {
std::vector<std::string> 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;
}

2
Core/Config.h
View File

@ -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)

2
ios/MoltenVK

@ -1 +1 @@
Subproject commit ad018e8664d343dd1e6d7a6ce712c64a6f8fee2a
Subproject commit 0bf904d2d1d159eb95bdefcd8432eee79ee1da14

4
ios/README.md
View File

@ -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
==============================

2
ios/main.mm
View File

@ -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;
}