Browse Source

[TEST] Hunting down recursive mutex 5

tiled-gpu
CamilleLaVey 2 weeks ago
parent
commit
a484e6c34b
  1. 2
      src/android/app/src/main/jni/android_settings.h
  2. 6
      src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

2
src/android/app/src/main/jni/android_settings.h

@ -147,7 +147,7 @@ namespace AndroidSettings {
&show_performance_overlay};
Settings::Setting<s32> pipeline_worker_count{linkage, 0, "pipeline_worker_count",
Settings::Setting<s32> pipeline_worker_count{linkage, 2, "pipeline_worker_count",
Settings::Category::Android,
Settings::Specialization::Default,
true,

6
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@ -305,10 +305,8 @@ size_t GetTotalPipelineWorkers() {
std::max<size_t>(static_cast<size_t>(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<size_t>(max_core_threads, static_cast<size_t>(configured));
const size_t desired = static_cast<size_t>(std::max(configured, 1));
return std::min<size_t>(max_core_threads, desired);
#else
return max_core_threads;
#endif

Loading…
Cancel
Save