From d75dc79f262cddbdda15323a630829b46e889c17 Mon Sep 17 00:00:00 2001 From: MrPurple666 Date: Thu, 8 May 2025 23:03:52 +0000 Subject: [PATCH] Some fixes before Release (#92) Co-authored-by: MrPurple666 Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/92 --- CMakeModules/CopyYuzuQt6Deps.cmake | 5 ++--- CMakeModules/aqt_config.ini | 1 - .../yuzu_emu}/dialogs/ChatDialog.kt | 0 .../yuzu_emu}/dialogs/NetPlayDialog.kt | 0 .../features/settings/model/view/SettingsItem.kt | 14 +++++++------- .../settings/ui/SettingsFragmentPresenter.kt | 2 +- .../yuzu_emu}/network/NetPlayManager.kt | 0 src/android/app/src/main/res/values/arrays.xml | 2 -- src/android/app/src/main/res/values/strings.xml | 3 +-- src/common/settings.h | 2 ++ src/video_core/host_shaders/CMakeLists.txt | 1 - .../host_shaders/convert_abgr8_srgb_to_d24s8.frag | 1 - src/video_core/renderer_vulkan/blit_image.cpp | 1 - src/video_core/renderer_vulkan/blit_image.h | 1 - .../renderer_vulkan/vk_texture_cache.cpp | 1 - src/video_core/renderer_vulkan/vk_texture_cache.h | 1 - .../renderer_vulkan/vk_texture_manager.cpp | 1 - 17 files changed, 13 insertions(+), 23 deletions(-) rename src/android/app/src/main/java/org/{citron/citron_emu => yuzu/yuzu_emu}/dialogs/ChatDialog.kt (100%) rename src/android/app/src/main/java/org/{citron/citron_emu => yuzu/yuzu_emu}/dialogs/NetPlayDialog.kt (100%) rename src/android/app/src/main/java/org/{citron/citron_emu => yuzu/yuzu_emu}/network/NetPlayManager.kt (100%) diff --git a/CMakeModules/CopyYuzuQt6Deps.cmake b/CMakeModules/CopyYuzuQt6Deps.cmake index b07781a59c..c6a5fa2db2 100644 --- a/CMakeModules/CopyYuzuQt6Deps.cmake +++ b/CMakeModules/CopyYuzuQt6Deps.cmake @@ -1,4 +1,3 @@ -# SPDX-FileCopyrightText: 2024 Citron HomeBrew Emulator Project # SPDX-FileCopyrightText: 2024 kleidis function(copy_yuzu_Qt6_deps target_dir) @@ -25,12 +24,12 @@ function(copy_yuzu_Qt6_deps target_dir) Qt6Widgets$<$:d>.* Qt6Network$<$:d>.* ) - if (CITRON_USE_QT_MULTIMEDIA) + if (YUZU_USE_QT_MULTIMEDIA) windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST} Qt6Multimedia$<$:d>.* ) endif() - if (CITRON_USE_QT_WEB_ENGINE) + if (YUZU_USE_QT_WEB_ENGINE) windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST} Qt6WebEngineCore$<$:d>.* Qt6WebEngineWidgets$<$:d>.* diff --git a/CMakeModules/aqt_config.ini b/CMakeModules/aqt_config.ini index 0ad399adab..c87caf4988 100644 --- a/CMakeModules/aqt_config.ini +++ b/CMakeModules/aqt_config.ini @@ -1,4 +1,3 @@ -# SPDX-FileCopyrightText: 2024 Citron HomeBrew Emulator Project # SPDX-FileCopyrightText: 2024 kleidis [aqt] diff --git a/src/android/app/src/main/java/org/citron/citron_emu/dialogs/ChatDialog.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/ChatDialog.kt similarity index 100% rename from src/android/app/src/main/java/org/citron/citron_emu/dialogs/ChatDialog.kt rename to src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/ChatDialog.kt diff --git a/src/android/app/src/main/java/org/citron/citron_emu/dialogs/NetPlayDialog.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt similarity index 100% rename from src/android/app/src/main/java/org/citron/citron_emu/dialogs/NetPlayDialog.kt rename to src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/NetPlayDialog.kt diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt index d649c365e6..47d45cf510 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt @@ -273,13 +273,6 @@ abstract class SettingsItem( descriptionId = R.string.use_docked_mode_description ) ) - put( - SwitchSetting( - BooleanSetting.USE_AUTO_STUB, - titleId = R.string.use_auto_stub, - descriptionId = R.string.use_auto_stub_description - ) - ) put( SwitchSetting( syncCoreSpeedSetting, @@ -570,6 +563,13 @@ abstract class SettingsItem( descriptionId = R.string.renderer_debug_description ) ) + put( + SwitchSetting( + BooleanSetting.USE_AUTO_STUB, + titleId = R.string.use_auto_stub, + descriptionId = R.string.use_auto_stub_description + ) + ) put( SwitchSetting( BooleanSetting.CPU_DEBUG_MODE, diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index 8f136790a6..8bc8d64115 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -261,7 +261,6 @@ class SettingsFragmentPresenter( add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key) add(ShortSetting.RENDERER_SPEED_LIMIT.key) add(BooleanSetting.USE_DOCKED_MODE.key) - add(BooleanSetting.USE_AUTO_STUB.key) add(IntSetting.REGION_INDEX.key) add(IntSetting.LANGUAGE_INDEX.key) add(BooleanSetting.USE_CUSTOM_RTC.key) @@ -1198,6 +1197,7 @@ class SettingsFragmentPresenter( add(HeaderSetting(R.string.cpu)) add(IntSetting.CPU_BACKEND.key) add(IntSetting.CPU_ACCURACY.key) + add(BooleanSetting.USE_AUTO_STUB.key) add(BooleanSetting.CPU_DEBUG_MODE.key) add(SettingsItem.FASTMEM_COMBINED) } diff --git a/src/android/app/src/main/java/org/citron/citron_emu/network/NetPlayManager.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/network/NetPlayManager.kt similarity index 100% rename from src/android/app/src/main/java/org/citron/citron_emu/network/NetPlayManager.kt rename to src/android/app/src/main/java/org/yuzu/yuzu_emu/network/NetPlayManager.kt diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 71a981402e..66409cbc9a 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -87,14 +87,12 @@ @string/shader_backend_glsl - @string/shader_backend_glasm @string/shader_backend_spirv 0 1 - 2 diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 00a6a9adf7..eec9eddcd3 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -692,7 +692,6 @@ These features may have repercussions on the device\'s temperature, some GPUs be GLSL - GLASM SPIR-V @@ -739,7 +738,7 @@ These features may have repercussions on the device\'s temperature, some GPUs be Enable LRU Cache - Enable or disable the Least Recently Used (LRU) cache for improved performance + Enable or disable the Least Recently Used (LRU) cache for improved performance, some games have issue with it, e.g TOTK 1.2.1 Immediate (Off) diff --git a/src/common/settings.h b/src/common/settings.h index 47dc65afa8..f2bf4f83c9 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -216,7 +216,9 @@ struct Values { SwitchableSetting sync_core_speed{linkage, false, "sync_core_speed", Category::Core, Specialization::Default}; // Memory + #ifdef ANDROID SwitchableSetting lru_cache_enabled{linkage, true, "use_lru_cache", Category::System}; + #endif // Cpu SwitchableSetting cpu_backend{linkage, diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt index 7e808780d8..fe3e9e982c 100644 --- a/src/video_core/host_shaders/CMakeLists.txt +++ b/src/video_core/host_shaders/CMakeLists.txt @@ -1,5 +1,4 @@ # SPDX-FileCopyrightText: 2018 yuzu Emulator Project -# SPDX-FileCopyrightText: 2025 citron Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later set(FIDELITYFX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals/FidelityFX-FSR/ffx-fsr) diff --git a/src/video_core/host_shaders/convert_abgr8_srgb_to_d24s8.frag b/src/video_core/host_shaders/convert_abgr8_srgb_to_d24s8.frag index 96c08aae4d..a9bd21192d 100644 --- a/src/video_core/host_shaders/convert_abgr8_srgb_to_d24s8.frag +++ b/src/video_core/host_shaders/convert_abgr8_srgb_to_d24s8.frag @@ -1,4 +1,3 @@ -// SPDX-FileCopyrightText: 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #version 450 diff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cpp index cf8c5454cc..7fb428d996 100644 --- a/src/video_core/renderer_vulkan/blit_image.cpp +++ b/src/video_core/renderer_vulkan/blit_image.cpp @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include diff --git a/src/video_core/renderer_vulkan/blit_image.h b/src/video_core/renderer_vulkan/blit_image.h index b7bc952637..3d400be6a9 100644 --- a/src/video_core/renderer_vulkan/blit_image.h +++ b/src/video_core/renderer_vulkan/blit_image.h @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project -// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 4e53dc6f55..0b98d71b97 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #include diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index fd540c849c..18d20b2db5 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project -// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/video_core/renderer_vulkan/vk_texture_manager.cpp b/src/video_core/renderer_vulkan/vk_texture_manager.cpp index 7fbf8c7a8c..003af9e6fb 100644 --- a/src/video_core/renderer_vulkan/vk_texture_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_manager.cpp @@ -1,4 +1,3 @@ -// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later #include