From e0a742277ab8690eb212875451d884bca1f72413 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Fri, 17 Jul 2026 03:00:53 -0400 Subject: [PATCH] [TEST] Hunting down recursive mutex 5 (cherry picked from commit a484e6c34b9d22c042a490310ec6de27b0c44655) --- src/android/app/src/main/jni/android_settings.h | 2 +- src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.h index 3aba766a1b..3eaa377b20 100644 --- a/src/android/app/src/main/jni/android_settings.h +++ b/src/android/app/src/main/jni/android_settings.h @@ -147,7 +147,7 @@ namespace AndroidSettings { &show_performance_overlay}; - Settings::Setting pipeline_worker_count{linkage, 0, "pipeline_worker_count", + Settings::Setting pipeline_worker_count{linkage, 2, "pipeline_worker_count", Settings::Category::Android, Settings::Specialization::Default, true, diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 92d16c4d67..8e60368406 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -305,10 +305,8 @@ size_t GetTotalPipelineWorkers() { std::max(static_cast(std::thread::hardware_concurrency()), 2ULL) - 1ULL; #ifdef __ANDROID__ const int configured = AndroidSettings::values.pipeline_worker_count.GetValue(); - if (configured <= 0) { - return max_core_threads; - } - return std::min(max_core_threads, static_cast(configured)); + const size_t desired = static_cast(std::max(configured, 1)); + return std::min(max_core_threads, desired); #else return max_core_threads; #endif