emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-06 07:27:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "android: Implement Adreno Turbo setting for eligible GPUs (#227)"

Browse Source 
This reverts commit f84503cf8c87b01bcbf2281ad348d2c91568a074.
This commit is contained in:
OpenSauce04 2025-03-05 22:01:07 +00:00
parent c024933ec3
commit 108ee2e428
6 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt
View File

@ -172,8 +172,6 @@ object NativeLibrary {
fileRedirectDir: String?
)
external fun enableAdrenoTurboMode(enable: Boolean)
external fun areKeysAvailable(): Boolean
external fun getHomeMenuPath(region: Int): String

3
src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt
View File

@ -73,8 +73,6 @@ class EmulationActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
NativeLibrary.enableAdrenoTurboMode(BooleanSetting.ADRENO_GPU_BOOST.boolean)
binding = ActivityEmulationBinding.inflate(layoutInflater)
screenAdjustmentUtil = ScreenAdjustmentUtil(this, windowManager, settingsViewModel.settings)
hotkeyUtility = HotkeyUtility(screenAdjustmentUtil, this)
@ -140,7 +138,6 @@ class EmulationActivity : AppCompatActivity() {
}
override fun onDestroy() {
NativeLibrary.enableAdrenoTurboMode(false)
EmulationLifecycleUtil.clear()
isEmulationRunning = false
instance = null

6
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt
View File

@ -15,8 +15,7 @@ enum class BooleanSetting(
ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
ADRENO_GPU_BOOST("adreno_gpu_boost", Settings.SECTION_RENDERER, false);
CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false);
override var boolean: Boolean = defaultValue
@ -37,8 +36,7 @@ enum class BooleanSetting(
private val NOT_RUNTIME_EDITABLE = listOf(
PLUGIN_LOADER,
ALLOW_PLUGIN_LOADER,
ASYNC_SHADERS,
ADRENO_GPU_BOOST
ASYNC_SHADERS
)
fun from(key: String): BooleanSetting? =

12
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -43,7 +43,6 @@ import org.citra.citra_emu.features.settings.model.view.SwitchSetting
import org.citra.citra_emu.features.settings.utils.SettingsFile
import org.citra.citra_emu.fragments.ResetSettingsDialogFragment
import org.citra.citra_emu.utils.BirthdayMonth
import org.citra.citra_emu.utils.GpuDriverHelper
import org.citra.citra_emu.utils.Log
import org.citra.citra_emu.utils.SystemSaveGame
import org.citra.citra_emu.utils.ThemeUtil
@ -779,17 +778,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
IntSetting.SHADERS_ACCURATE_MUL.defaultValue
)
)
if (GpuDriverHelper.supportsCustomDriverLoading()) {
add(
SwitchSetting(
BooleanSetting.ADRENO_GPU_BOOST,
R.string.adreno_gpu_boost,
R.string.adreno_gpu_boost_description,
BooleanSetting.ADRENO_GPU_BOOST.key,
BooleanSetting.ADRENO_GPU_BOOST.defaultValue
)
)
}
add(
SwitchSetting(
IntSetting.DISK_SHADER_CACHE,

11
src/android/app/src/main/jni/native.cpp
View File

@ -255,12 +255,6 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
return Core::System::ResultStatus::Success;
}
void EnableAdrenoTurboMode(bool enable) {
#if defined(ENABLE_VULKAN) && CITRA_ARCH(arm64)
adrenotools_set_turbo(enable);
#endif
}
void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
const std::string& custom_driver_name,
const std::string& file_redirect_dir) {
@ -340,11 +334,6 @@ void JNICALL Java_org_citra_citra_1emu_NativeLibrary_initializeGpuDriver(
GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));
}
void JNICALL Java_org_citra_citra_1emu_NativeLibrary_enableAdrenoTurboMode(JNIEnv* env, jobject obj,
jboolean enable) {
EnableAdrenoTurboMode(enable);
}
void Java_org_citra_citra_1emu_NativeLibrary_notifyOrientationChange([[maybe_unused]] JNIEnv* env,
[[maybe_unused]] jobject obj,
jint layout_option,

2
src/android/app/src/main/res/values/strings.xml
View File

@ -269,8 +269,6 @@
<string name="use_shader_jit">Shader JIT</string>
<string name="use_disk_shader_cache">Disk Shader Cache</string>
<string name="use_disk_shader_cache_description">Reduce stuttering by storing and loading generated shaders to disk. It cannot be used without Enabling Hardware Shader.</string>
<string name="adreno_gpu_boost">Adreno GPU Boost (Experimental)</string>
<string name="adreno_gpu_boost_description">Increases graphics throughput on supported devices, improving performance. Use of this setting can increase power usage and temperature. May cause stability issues on certain devices.</string>
<string name="utility">Utility</string>
<string name="dump_textures">Dump Textures</string>
<string name="dump_textures_description">Textures are dumped to dump/textures/[Title ID]/.</string>