diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index ee927af24..48fb35f6c 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -117,10 +117,6 @@ void Config::ReadValues() { Settings::values.graphics_api = static_cast(sdl2_config->GetInteger("Renderer", "graphics_api", 2)); Settings::values.renderer_debug = sdl2_config->GetBoolean("Renderer", "renderer_debug", false); - Settings::values.async_command_recording = - sdl2_config->GetBoolean("Renderer", "async_command_recording", true) && - !Settings::values - .renderer_debug; ///< Enabling debug renderer force disables async recording Settings::values.async_shader_compilation = sdl2_config->GetBoolean("Renderer", "async_shader_compilation", true); Settings::values.spirv_shader_gen = diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 1b643a5c4..379ba37ac 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -604,7 +604,6 @@ void Config::ReadRendererValues() { qt_config->beginGroup(QStringLiteral("Renderer")); ReadGlobalSetting(Settings::values.physical_device); - ReadGlobalSetting(Settings::values.async_command_recording); ReadGlobalSetting(Settings::values.async_shader_compilation); ReadGlobalSetting(Settings::values.spirv_shader_gen); ReadGlobalSetting(Settings::values.graphics_api); @@ -1090,7 +1089,6 @@ void Config::SaveRendererValues() { WriteGlobalSetting(Settings::values.graphics_api); WriteGlobalSetting(Settings::values.physical_device); - WriteGlobalSetting(Settings::values.async_command_recording); WriteGlobalSetting(Settings::values.async_shader_compilation); WriteGlobalSetting(Settings::values.spirv_shader_gen); WriteGlobalSetting(Settings::values.use_hw_renderer); diff --git a/src/citra_qt/configuration/configure_graphics.cpp b/src/citra_qt/configuration/configure_graphics.cpp index 9d48f5eee..44f3ebd38 100644 --- a/src/citra_qt/configuration/configure_graphics.cpp +++ b/src/citra_qt/configuration/configure_graphics.cpp @@ -87,7 +87,6 @@ void ConfigureGraphics::SetConfiguration() { static_cast(Settings::values.graphics_api.GetValue())); ui->physical_device_combo->setCurrentIndex( static_cast(Settings::values.physical_device.GetValue())); - ui->toggle_async_recording->setChecked(Settings::values.async_command_recording.GetValue()); ui->spirv_shader_gen->setChecked(Settings::values.spirv_shader_gen.GetValue()); ui->toggle_async_shaders->setChecked(Settings::values.async_shader_compilation.GetValue()); @@ -113,8 +112,6 @@ void ConfigureGraphics::ApplyConfiguration() { ui->graphics_api_combo); ConfigurationShared::ApplyPerGameSetting(&Settings::values.physical_device, ui->physical_device_combo); - ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_command_recording, - ui->toggle_async_recording, async_command_recording); ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_shader_compilation, ui->toggle_async_shaders, async_shader_compilation); ConfigurationShared::ApplyPerGameSetting(&Settings::values.spirv_shader_gen, diff --git a/src/citra_qt/configuration/configure_graphics.h b/src/citra_qt/configuration/configure_graphics.h index 6530f1779..3853eb16d 100644 --- a/src/citra_qt/configuration/configure_graphics.h +++ b/src/citra_qt/configuration/configure_graphics.h @@ -40,7 +40,6 @@ private: ConfigurationShared::CheckState shaders_accurate_mul; ConfigurationShared::CheckState use_disk_shader_cache; ConfigurationShared::CheckState use_vsync_new; - ConfigurationShared::CheckState async_command_recording; ConfigurationShared::CheckState async_shader_compilation; ConfigurationShared::CheckState spirv_shader_gen; std::unique_ptr ui; diff --git a/src/citra_qt/configuration/configure_graphics.ui b/src/citra_qt/configuration/configure_graphics.ui index 78055787e..c1b99d027 100644 --- a/src/citra_qt/configuration/configure_graphics.ui +++ b/src/citra_qt/configuration/configure_graphics.ui @@ -169,13 +169,6 @@ - - - - Async Shader Compilation - - - @@ -186,12 +179,9 @@ - - - <html><head/><body><p>Offloads command buffer recording and fragment shader generation to a worker thread. Can improve performance especially on weaker systems. Disable if you notice better performance. If unsure leave it enabled,</p></body></html> - + - Async Command Recording + Async Shader Compilation diff --git a/src/common/settings.cpp b/src/common/settings.cpp index c0ffa3cae..9aa4c4813 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -107,7 +107,6 @@ void LogSettings() { log_setting("Core_UseCpuJit", values.use_cpu_jit.GetValue()); log_setting("Core_CPUClockPercentage", values.cpu_clock_percentage.GetValue()); log_setting("Renderer_GraphicsAPI", GetAPIName(values.graphics_api.GetValue())); - log_setting("Renderer_AsyncRecording", values.async_command_recording.GetValue()); log_setting("Renderer_AsyncShaders", values.async_shader_compilation.GetValue()); log_setting("Renderer_SpirvShaderGen", values.spirv_shader_gen.GetValue()); log_setting("Renderer_Debug", values.renderer_debug.GetValue()); diff --git a/src/common/settings.h b/src/common/settings.h index 7540974ea..0974af5ba 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -452,7 +452,6 @@ struct Values { Setting dump_command_buffers{false, "dump_command_buffers"}; SwitchableSetting spirv_shader_gen{true, "spirv_shader_gen"}; SwitchableSetting async_shader_compilation{false, "async_shader_compilation"}; - SwitchableSetting async_command_recording{true, "async_command_recording"}; SwitchableSetting use_hw_renderer{true, "use_hw_renderer"}; SwitchableSetting use_hw_shader{true, "use_hw_shader"}; SwitchableSetting separable_shader{false, "use_separable_shader"}; diff --git a/src/video_core/renderer_vulkan/vk_scheduler.cpp b/src/video_core/renderer_vulkan/vk_scheduler.cpp index 43da26cb4..4e22b08df 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.cpp +++ b/src/video_core/renderer_vulkan/vk_scheduler.cpp @@ -32,7 +32,7 @@ void Scheduler::CommandChunk::ExecuteAll(vk::CommandBuffer cmdbuf) { Scheduler::Scheduler(const Instance& instance, RenderpassCache& renderpass_cache) : instance{instance}, renderpass_cache{renderpass_cache}, master_semaphore{instance}, command_pool{instance, master_semaphore}, use_worker_thread{ - Settings::values.async_command_recording} { + !Settings::values.renderer_debug} { AllocateWorkerCommandBuffers(); if (use_worker_thread) { AcquireNewChunk();