summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/jni/config.cpp4
-rw-r--r--src/android/app/src/main/jni/default_ini.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp
index 7a83fea42..34aa1ee4c 100644
--- a/src/android/app/src/main/jni/config.cpp
+++ b/src/android/app/src/main/jni/config.cpp
@@ -214,7 +214,6 @@ void Config::ReadValues() {
214 ReadSetting("Renderer", Settings::values.shader_backend); 214 ReadSetting("Renderer", Settings::values.shader_backend);
215 ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); 215 ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
216 ReadSetting("Renderer", Settings::values.nvdec_emulation); 216 ReadSetting("Renderer", Settings::values.nvdec_emulation);
217 ReadSetting("Renderer", Settings::values.accelerate_astc);
218 ReadSetting("Renderer", Settings::values.use_fast_gpu_time); 217 ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
219 ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); 218 ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);
220 ReadSetting("Renderer", Settings::values.async_presentation); 219 ReadSetting("Renderer", Settings::values.async_presentation);
@@ -227,6 +226,9 @@ void Config::ReadValues() {
227 ReadSetting("Renderer", Settings::values.bg_green); 226 ReadSetting("Renderer", Settings::values.bg_green);
228 ReadSetting("Renderer", Settings::values.bg_blue); 227 ReadSetting("Renderer", Settings::values.bg_blue);
229 228
229 // Disable ASTC compute by default on Android
230 Settings::values.accelerate_astc = config->GetBoolean("Renderer", "accelerate_astc", false);
231
230 // Enable force_max_clock by default on Android 232 // Enable force_max_clock by default on Android
231 Settings::values.renderer_force_max_clock = 233 Settings::values.renderer_force_max_clock =
232 config->GetBoolean("Renderer", "force_max_clock", true); 234 config->GetBoolean("Renderer", "force_max_clock", true);
diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h
index d6bf458a6..da541851e 100644
--- a/src/android/app/src/main/jni/default_ini.h
+++ b/src/android/app/src/main/jni/default_ini.h
@@ -333,7 +333,7 @@ use_asynchronous_shaders =
333nvdec_emulation = 333nvdec_emulation =
334 334
335# Accelerate ASTC texture decoding. 335# Accelerate ASTC texture decoding.
336# 0: Off, 1 (default): On 336# 0 (default): Off, 1: On
337accelerate_astc = 337accelerate_astc =
338 338
339# Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value 339# Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value