mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2025-03-06 15:38:13 +01:00
Revert "android: Implement Adreno Turbo setting for eligible GPUs (#227)"
This reverts commit f84503cf8c87b01bcbf2281ad348d2c91568a074.
This commit is contained in:
parent
c024933ec3
commit
108ee2e428
@ -172,8 +172,6 @@ object NativeLibrary {
|
|||||||
fileRedirectDir: String?
|
fileRedirectDir: String?
|
||||||
)
|
)
|
||||||
|
|
||||||
external fun enableAdrenoTurboMode(enable: Boolean)
|
|
||||||
|
|
||||||
external fun areKeysAvailable(): Boolean
|
external fun areKeysAvailable(): Boolean
|
||||||
|
|
||||||
external fun getHomeMenuPath(region: Int): String
|
external fun getHomeMenuPath(region: Int): String
|
||||||
|
@ -73,8 +73,6 @@ class EmulationActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
NativeLibrary.enableAdrenoTurboMode(BooleanSetting.ADRENO_GPU_BOOST.boolean)
|
|
||||||
|
|
||||||
binding = ActivityEmulationBinding.inflate(layoutInflater)
|
binding = ActivityEmulationBinding.inflate(layoutInflater)
|
||||||
screenAdjustmentUtil = ScreenAdjustmentUtil(this, windowManager, settingsViewModel.settings)
|
screenAdjustmentUtil = ScreenAdjustmentUtil(this, windowManager, settingsViewModel.settings)
|
||||||
hotkeyUtility = HotkeyUtility(screenAdjustmentUtil, this)
|
hotkeyUtility = HotkeyUtility(screenAdjustmentUtil, this)
|
||||||
@ -140,7 +138,6 @@ class EmulationActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
NativeLibrary.enableAdrenoTurboMode(false)
|
|
||||||
EmulationLifecycleUtil.clear()
|
EmulationLifecycleUtil.clear()
|
||||||
isEmulationRunning = false
|
isEmulationRunning = false
|
||||||
instance = null
|
instance = null
|
||||||
|
@ -15,8 +15,7 @@ enum class BooleanSetting(
|
|||||||
ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
|
ALLOW_PLUGIN_LOADER("allow_plugin_loader", Settings.SECTION_SYSTEM, true),
|
||||||
SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
|
SWAP_SCREEN("swap_screen", Settings.SECTION_LAYOUT, false),
|
||||||
INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
|
INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
|
||||||
CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
|
CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false);
|
||||||
ADRENO_GPU_BOOST("adreno_gpu_boost", Settings.SECTION_RENDERER, false);
|
|
||||||
|
|
||||||
override var boolean: Boolean = defaultValue
|
override var boolean: Boolean = defaultValue
|
||||||
|
|
||||||
@ -37,8 +36,7 @@ enum class BooleanSetting(
|
|||||||
private val NOT_RUNTIME_EDITABLE = listOf(
|
private val NOT_RUNTIME_EDITABLE = listOf(
|
||||||
PLUGIN_LOADER,
|
PLUGIN_LOADER,
|
||||||
ALLOW_PLUGIN_LOADER,
|
ALLOW_PLUGIN_LOADER,
|
||||||
ASYNC_SHADERS,
|
ASYNC_SHADERS
|
||||||
ADRENO_GPU_BOOST
|
|
||||||
)
|
)
|
||||||
|
|
||||||
fun from(key: String): BooleanSetting? =
|
fun from(key: String): BooleanSetting? =
|
||||||
|
@ -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.features.settings.utils.SettingsFile
|
||||||
import org.citra.citra_emu.fragments.ResetSettingsDialogFragment
|
import org.citra.citra_emu.fragments.ResetSettingsDialogFragment
|
||||||
import org.citra.citra_emu.utils.BirthdayMonth
|
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.Log
|
||||||
import org.citra.citra_emu.utils.SystemSaveGame
|
import org.citra.citra_emu.utils.SystemSaveGame
|
||||||
import org.citra.citra_emu.utils.ThemeUtil
|
import org.citra.citra_emu.utils.ThemeUtil
|
||||||
@ -779,17 +778,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
|
|||||||
IntSetting.SHADERS_ACCURATE_MUL.defaultValue
|
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(
|
add(
|
||||||
SwitchSetting(
|
SwitchSetting(
|
||||||
IntSetting.DISK_SHADER_CACHE,
|
IntSetting.DISK_SHADER_CACHE,
|
||||||
|
@ -255,12 +255,6 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
|
|||||||
return Core::System::ResultStatus::Success;
|
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,
|
void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
|
||||||
const std::string& custom_driver_name,
|
const std::string& custom_driver_name,
|
||||||
const std::string& file_redirect_dir) {
|
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));
|
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,
|
void Java_org_citra_citra_1emu_NativeLibrary_notifyOrientationChange([[maybe_unused]] JNIEnv* env,
|
||||||
[[maybe_unused]] jobject obj,
|
[[maybe_unused]] jobject obj,
|
||||||
jint layout_option,
|
jint layout_option,
|
||||||
|
@ -269,8 +269,6 @@
|
|||||||
<string name="use_shader_jit">Shader JIT</string>
|
<string name="use_shader_jit">Shader JIT</string>
|
||||||
<string name="use_disk_shader_cache">Disk Shader Cache</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="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="utility">Utility</string>
|
||||||
<string name="dump_textures">Dump Textures</string>
|
<string name="dump_textures">Dump Textures</string>
|
||||||
<string name="dump_textures_description">Textures are dumped to dump/textures/[Title ID]/.</string>
|
<string name="dump_textures_description">Textures are dumped to dump/textures/[Title ID]/.</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user