diff --git a/Common/File/AndroidStorage.cpp b/Common/File/AndroidStorage.cpp index 1163d50426..d65129d91a 100644 --- a/Common/File/AndroidStorage.cpp +++ b/Common/File/AndroidStorage.cpp @@ -368,6 +368,5 @@ const char *Android_ErrorToString(StorageError error) { // Very hacky. std::string g_extFilesDir = "(IF YOU SEE THIS THERE'S A BUG)"; std::string g_externalDir = "(IF YOU SEE THIS THERE'S A BUG (2))"; -std::string g_nativeLibDir = "(IF YOU SEE THIS THERE'S A BUG (3))"; #endif diff --git a/Common/File/AndroidStorage.h b/Common/File/AndroidStorage.h index 26fdc8ada2..54ac51d37b 100644 --- a/Common/File/AndroidStorage.h +++ b/Common/File/AndroidStorage.h @@ -33,7 +33,6 @@ inline StorageError StorageErrorFromInt(int ival) { extern std::string g_extFilesDir; extern std::string g_externalDir; -extern std::string g_nativeLibDir; // Note that we don't use string_view much here because NewStringUTF doesn't have a size parameter. diff --git a/Common/GPU/Vulkan/VulkanLoader.cpp b/Common/GPU/Vulkan/VulkanLoader.cpp index cb1f03b528..371e4f01f6 100644 --- a/Common/GPU/Vulkan/VulkanLoader.cpp +++ b/Common/GPU/Vulkan/VulkanLoader.cpp @@ -265,6 +265,7 @@ static VulkanLibraryHandle vulkanLibrary; bool g_vulkanAvailabilityChecked = false; bool g_vulkanMayBeAvailable = false; +static std::string g_nativeLibDir; static PFN_vkVoidFunction LoadInstanceFunc(VkInstance instance, const char *name) { PFN_vkVoidFunction funcPtr = vkGetInstanceProcAddr(instance, name); @@ -432,6 +433,10 @@ void VulkanSetAvailable(bool available) { g_vulkanMayBeAvailable = available; } +void VulkanSetNativeLibDir(std::string_view nativeLibDir) { + g_nativeLibDir = nativeLibDir; +} + bool VulkanMayBeAvailable() { #if PPSSPP_PLATFORM(IOS) g_vulkanAvailabilityChecked = true; diff --git a/Common/GPU/Vulkan/VulkanLoader.h b/Common/GPU/Vulkan/VulkanLoader.h index 159cb97c03..5a6b60b667 100644 --- a/Common/GPU/Vulkan/VulkanLoader.h +++ b/Common/GPU/Vulkan/VulkanLoader.h @@ -281,6 +281,7 @@ struct VulkanExtensions { }; // Way to do a quick check before even attempting to load. +void VulkanSetNativeLibDir(std::string_view nativeLibDir); bool VulkanMayBeAvailable(); void VulkanSetAvailable(bool available); diff --git a/Core/Config.cpp b/Core/Config.cpp index e2f6b70de6..4963701af9 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -563,7 +563,6 @@ int Config::NextValidBackend() { return (int)GPUBackend::OPENGL; } #endif - // They've all failed. Let them try the default - or on Android, OpenGL. if (sFailedGPUBackends.find(",ALL") == std::string::npos) { sFailedGPUBackends += ",ALL"; diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index d622134f9c..d8dafa02a2 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -136,7 +136,6 @@ static std::string boardName; std::string g_externalDir; // Original external dir (root of Android storage). std::string g_extFilesDir; // App private external dir. -std::string g_nativeLibDir; // App native library dir static std::vector g_additionalStorageDirs; @@ -695,7 +694,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init g_externalDir = externalStorageDir; g_extFilesDir = externalFilesDir; - g_nativeLibDir = nativeLibDir; + VulkanSetNativeLibDir(nativeLibDir); if (!additionalStorageDirsString.empty()) { SplitString(additionalStorageDirsString, ':', g_additionalStorageDirs);