Some fixes before Release (#92)
Co-authored-by: MrPurple666 <antoniosacramento666@gmail.com> Reviewed-on: #92
This commit is contained in:
parent
f786802b9b
commit
d75dc79f26
17 changed files with 13 additions and 23 deletions
|
@ -1,4 +1,3 @@
|
||||||
# SPDX-FileCopyrightText: 2024 Citron HomeBrew Emulator Project
|
|
||||||
# SPDX-FileCopyrightText: 2024 kleidis
|
# SPDX-FileCopyrightText: 2024 kleidis
|
||||||
|
|
||||||
function(copy_yuzu_Qt6_deps target_dir)
|
function(copy_yuzu_Qt6_deps target_dir)
|
||||||
|
@ -25,12 +24,12 @@ function(copy_yuzu_Qt6_deps target_dir)
|
||||||
Qt6Widgets$<$<CONFIG:Debug>:d>.*
|
Qt6Widgets$<$<CONFIG:Debug>:d>.*
|
||||||
Qt6Network$<$<CONFIG:Debug>:d>.*
|
Qt6Network$<$<CONFIG:Debug>:d>.*
|
||||||
)
|
)
|
||||||
if (CITRON_USE_QT_MULTIMEDIA)
|
if (YUZU_USE_QT_MULTIMEDIA)
|
||||||
windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
|
windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
|
||||||
Qt6Multimedia$<$<CONFIG:Debug>:d>.*
|
Qt6Multimedia$<$<CONFIG:Debug>:d>.*
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
if (CITRON_USE_QT_WEB_ENGINE)
|
if (YUZU_USE_QT_WEB_ENGINE)
|
||||||
windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
|
windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
|
||||||
Qt6WebEngineCore$<$<CONFIG:Debug>:d>.*
|
Qt6WebEngineCore$<$<CONFIG:Debug>:d>.*
|
||||||
Qt6WebEngineWidgets$<$<CONFIG:Debug>:d>.*
|
Qt6WebEngineWidgets$<$<CONFIG:Debug>:d>.*
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# SPDX-FileCopyrightText: 2024 Citron HomeBrew Emulator Project
|
|
||||||
# SPDX-FileCopyrightText: 2024 kleidis
|
# SPDX-FileCopyrightText: 2024 kleidis
|
||||||
|
|
||||||
[aqt]
|
[aqt]
|
||||||
|
|
|
@ -273,13 +273,6 @@ abstract class SettingsItem(
|
||||||
descriptionId = R.string.use_docked_mode_description
|
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(
|
put(
|
||||||
SwitchSetting(
|
SwitchSetting(
|
||||||
syncCoreSpeedSetting,
|
syncCoreSpeedSetting,
|
||||||
|
@ -570,6 +563,13 @@ abstract class SettingsItem(
|
||||||
descriptionId = R.string.renderer_debug_description
|
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(
|
put(
|
||||||
SwitchSetting(
|
SwitchSetting(
|
||||||
BooleanSetting.CPU_DEBUG_MODE,
|
BooleanSetting.CPU_DEBUG_MODE,
|
||||||
|
|
|
@ -261,7 +261,6 @@ class SettingsFragmentPresenter(
|
||||||
add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
|
add(BooleanSetting.RENDERER_USE_SPEED_LIMIT.key)
|
||||||
add(ShortSetting.RENDERER_SPEED_LIMIT.key)
|
add(ShortSetting.RENDERER_SPEED_LIMIT.key)
|
||||||
add(BooleanSetting.USE_DOCKED_MODE.key)
|
add(BooleanSetting.USE_DOCKED_MODE.key)
|
||||||
add(BooleanSetting.USE_AUTO_STUB.key)
|
|
||||||
add(IntSetting.REGION_INDEX.key)
|
add(IntSetting.REGION_INDEX.key)
|
||||||
add(IntSetting.LANGUAGE_INDEX.key)
|
add(IntSetting.LANGUAGE_INDEX.key)
|
||||||
add(BooleanSetting.USE_CUSTOM_RTC.key)
|
add(BooleanSetting.USE_CUSTOM_RTC.key)
|
||||||
|
@ -1198,6 +1197,7 @@ class SettingsFragmentPresenter(
|
||||||
add(HeaderSetting(R.string.cpu))
|
add(HeaderSetting(R.string.cpu))
|
||||||
add(IntSetting.CPU_BACKEND.key)
|
add(IntSetting.CPU_BACKEND.key)
|
||||||
add(IntSetting.CPU_ACCURACY.key)
|
add(IntSetting.CPU_ACCURACY.key)
|
||||||
|
add(BooleanSetting.USE_AUTO_STUB.key)
|
||||||
add(BooleanSetting.CPU_DEBUG_MODE.key)
|
add(BooleanSetting.CPU_DEBUG_MODE.key)
|
||||||
add(SettingsItem.FASTMEM_COMBINED)
|
add(SettingsItem.FASTMEM_COMBINED)
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,14 +87,12 @@
|
||||||
|
|
||||||
<string-array name="rendererShaderNames">
|
<string-array name="rendererShaderNames">
|
||||||
<item>@string/shader_backend_glsl</item>
|
<item>@string/shader_backend_glsl</item>
|
||||||
<item>@string/shader_backend_glasm</item>
|
|
||||||
<item>@string/shader_backend_spirv</item>
|
<item>@string/shader_backend_spirv</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<integer-array name="rendererShaderValues">
|
<integer-array name="rendererShaderValues">
|
||||||
<item>0</item>
|
<item>0</item>
|
||||||
<item>1</item>
|
<item>1</item>
|
||||||
<item>2</item>
|
|
||||||
</integer-array>
|
</integer-array>
|
||||||
|
|
||||||
<!-- VRAM USAGE MODE CHOICES -->
|
<!-- VRAM USAGE MODE CHOICES -->
|
||||||
|
|
|
@ -692,7 +692,6 @@ These features may have repercussions on the device\'s temperature, some GPUs be
|
||||||
|
|
||||||
<!-- Shader Backend -->
|
<!-- Shader Backend -->
|
||||||
<string name="shader_backend_glsl">GLSL</string>
|
<string name="shader_backend_glsl">GLSL</string>
|
||||||
<string name="shader_backend_glasm">GLASM</string>
|
|
||||||
<string name="shader_backend_spirv">SPIR-V</string>
|
<string name="shader_backend_spirv">SPIR-V</string>
|
||||||
|
|
||||||
<!-- NVDEC Emulation -->
|
<!-- NVDEC Emulation -->
|
||||||
|
@ -739,7 +738,7 @@ These features may have repercussions on the device\'s temperature, some GPUs be
|
||||||
|
|
||||||
<!-- LRU Cache -->
|
<!-- LRU Cache -->
|
||||||
<string name="use_lru_cache">Enable LRU Cache</string>
|
<string name="use_lru_cache">Enable LRU Cache</string>
|
||||||
<string name="use_lru_cache_description">Enable or disable the Least Recently Used (LRU) cache for improved performance</string>
|
<string name="use_lru_cache_description">Enable or disable the Least Recently Used (LRU) cache for improved performance, some games have issue with it, e.g TOTK 1.2.1</string>
|
||||||
|
|
||||||
<!-- Renderer VSync -->
|
<!-- Renderer VSync -->
|
||||||
<string name="renderer_vsync_immediate">Immediate (Off)</string>
|
<string name="renderer_vsync_immediate">Immediate (Off)</string>
|
||||||
|
|
|
@ -216,7 +216,9 @@ struct Values {
|
||||||
SwitchableSetting<bool> sync_core_speed{linkage, false, "sync_core_speed", Category::Core, Specialization::Default};
|
SwitchableSetting<bool> sync_core_speed{linkage, false, "sync_core_speed", Category::Core, Specialization::Default};
|
||||||
|
|
||||||
// Memory
|
// Memory
|
||||||
|
#ifdef ANDROID
|
||||||
SwitchableSetting<bool> lru_cache_enabled{linkage, true, "use_lru_cache", Category::System};
|
SwitchableSetting<bool> lru_cache_enabled{linkage, true, "use_lru_cache", Category::System};
|
||||||
|
#endif
|
||||||
|
|
||||||
// Cpu
|
// Cpu
|
||||||
SwitchableSetting<CpuBackend, true> cpu_backend{linkage,
|
SwitchableSetting<CpuBackend, true> cpu_backend{linkage,
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
||||||
# SPDX-FileCopyrightText: 2025 citron Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
set(FIDELITYFX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals/FidelityFX-FSR/ffx-fsr)
|
set(FIDELITYFX_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/externals/FidelityFX-FSR/ffx-fsr)
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
// SPDX-FileCopyrightText: 2025 citron Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#version 450
|
#version 450
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
||||||
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
||||||
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
||||||
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
||||||
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue