diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt index 95501bc0b..40dbc94c9 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt @@ -172,8 +172,6 @@ object NativeLibrary { fileRedirectDir: String? ) - external fun enableAdrenoTurboMode(enable: Boolean) - external fun areKeysAvailable(): Boolean external fun getHomeMenuPath(region: Int): String diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt index 2d33d5cf7..8d9bf24e3 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt @@ -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 diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt index 3dd4c5e35..4e5481d7c 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt @@ -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? = diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt index 9239f1169..31401567f 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -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, diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index c94b015db..d4263c18a 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -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, diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index a158c52f0..0df66990f 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -269,8 +269,6 @@ Shader JIT Disk Shader Cache Reduce stuttering by storing and loading generated shaders to disk. It cannot be used without Enabling Hardware Shader. - Adreno GPU Boost (Experimental) - 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. Utility Dump Textures Textures are dumped to dump/textures/[Title ID]/.