2026-09-05 17:39:32

Signed-off-by: lizzie <lizzie@eden-emu.dev>

externals/tz/tz/tz.h

@@ -11,7 +11,6 @@
 #include <limits>
 #include <span>
 #include <array>
-#include <algorithm>
 #include <time.h>
 
 namespace Tz {

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt

@@ -28,13 +28,13 @@ object NativeConfig {
      * Reads values in the global config file and saves them.
      */
     @Synchronized
-    external fun reloadGlobalConfig()
+    external fun reloadGlobalConfig(): Boolean
 
     /**
      * Saves global settings values in memory to disk.
      */
     @Synchronized
-    external fun saveGlobalConfig()
+    external fun saveGlobalConfig(): Boolean
 
     /**
      * Creates per-game config for the specified parameters. Must be unloaded once per-game config
@@ -54,7 +54,7 @@ object NativeConfig {
      * Saves per-game settings values in memory to disk.
      */
     @Synchronized
-    external fun savePerGameConfig()
+    external fun savePerGameConfig(): Boolean
 
     /**
      * Destroys the stored per-game config object. This does not save the config.

src/android/app/src/main/jni/native_config.cpp

@@ -45,12 +45,16 @@ void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_unloadGlobalConfig(JNIEnv* env,
     global_config.reset();
 }
 
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_reloadGlobalConfig(JNIEnv* env, jobject obj) {
-    global_config->AndroidConfig::ReloadAllValues();
+jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_reloadGlobalConfig(JNIEnv* env, jobject obj) {
+    if (global_config)
+        global_config->AndroidConfig::ReloadAllValues();
+    return global_config != nullptr;
 }
 
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_saveGlobalConfig(JNIEnv* env, jobject obj) {
-    global_config->AndroidConfig::SaveAllValues();
+jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_saveGlobalConfig(JNIEnv* env, jobject obj) {
+    if (global_config)
+        global_config->AndroidConfig::SaveAllValues();
+    return global_config != nullptr;
 }
 
 void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv* env, jobject obj,
@@ -63,13 +67,14 @@ void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv*
         std::make_unique<AndroidConfig>(config_file_name, Config::ConfigType::PerGameConfig);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_isPerGameConfigLoaded(JNIEnv* env,
-                                                                          jobject obj) {
+jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_isPerGameConfigLoaded(JNIEnv* env, jobject obj) {
     return per_game_config != nullptr;
 }
 
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_savePerGameConfig(JNIEnv* env, jobject obj) {
-    per_game_config->AndroidConfig::SaveAllValues();
+jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_savePerGameConfig(JNIEnv* env, jobject obj) {
+    if (per_game_config)
+        per_game_config->AndroidConfig::SaveAllValues();
+    return per_game_config != nullptr;
 }
 
 void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_unloadPerGameConfig(JNIEnv* env, jobject obj) {

src/common/demangle.cpp

@@ -5,7 +5,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <string>
-#include <cstdlib>
 #include <string_view>
 #ifdef _WIN32
 #include <llvm/Demangle/Demangle.h>

src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -459,20 +459,8 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
 #else
     constexpr VkFlags ci_flags{};
 #endif
-    // DO NOT TOUCH OR CHANGE THE ENGINE NAME/APPLICATION NAME, breaks RNDA3!!
-    // AMD drivers have fixes for Yuzu
-    // if remove => gloom + yellow line glitch appears
-#ifdef __ANDROID__
-    const VkApplicationInfo application_info{
-        .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
-        .pNext = nullptr,
-        .pApplicationName = "PUBGMobile",
-        .applicationVersion = VK_MAKE_VERSION(1, 7, 0),
-        .pEngineName = "UnrealEngine",
-        .engineVersion = VK_MAKE_VERSION(4, 23, 0),
-        .apiVersion = VK_API_VERSION_1_3,
-    };
-#else
+    // DO NOT TOUCH, breaks RNDA3!!
+    // Don't know why, but gloom + yellow line glitch appears
     const VkApplicationInfo application_info{
         .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
         .pNext = nullptr,
@@ -482,7 +470,6 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
         .engineVersion = VK_MAKE_VERSION(1, 3, 0),
         .apiVersion = VK_API_VERSION_1_3,
     };
-#endif
     const VkInstanceCreateInfo ci{
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
         .pNext = nullptr,