summaryrefslogtreecommitdiffstats
path: root/src/android/app
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-05-06 09:40:10 +0200
committerbunnei <bunneidev@gmail.com>2023-06-03 09:06:00 +0200
commit8dc7fe0c968ef110d987dea75bad30817035372c (patch)
treed4ddb7bd8f4b29bb92169512ed1a2e072edf8dbf /src/android/app
parentandroid: Update progard to fix settings crash (diff)
downloadyuzu-8dc7fe0c968ef110d987dea75bad30817035372c.tar
yuzu-8dc7fe0c968ef110d987dea75bad30817035372c.tar.gz
yuzu-8dc7fe0c968ef110d987dea75bad30817035372c.tar.bz2
yuzu-8dc7fe0c968ef110d987dea75bad30817035372c.tar.lz
yuzu-8dc7fe0c968ef110d987dea75bad30817035372c.tar.xz
yuzu-8dc7fe0c968ef110d987dea75bad30817035372c.tar.zst
yuzu-8dc7fe0c968ef110d987dea75bad30817035372c.zip
Diffstat (limited to 'src/android/app')
-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() {
ReadSetting("Renderer", Settings::values.shader_backend);
ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
ReadSetting("Renderer", Settings::values.nvdec_emulation);
- ReadSetting("Renderer", Settings::values.accelerate_astc);
ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);
ReadSetting("Renderer", Settings::values.async_presentation);
@@ -227,6 +226,9 @@ void Config::ReadValues() {
ReadSetting("Renderer", Settings::values.bg_green);
ReadSetting("Renderer", Settings::values.bg_blue);
+ // Disable ASTC compute by default on Android
+ Settings::values.accelerate_astc = config->GetBoolean("Renderer", "accelerate_astc", false);
+
// Enable force_max_clock by default on Android
Settings::values.renderer_force_max_clock =
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 =
nvdec_emulation =
# Accelerate ASTC texture decoding.
-# 0: Off, 1 (default): On
+# 0 (default): Off, 1: On
accelerate_astc =
# Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value