Merge pull request #12227 from iwubcode/wait_on_gpu_when_config_changes

VideoCommon: wait for the GPU to be finished doing any work before invalidating pipelines when graphics config changes
dolphin-emu · Oct 11, 2023 · 601767c · 601767c
2 parents 6aadfd5 + b251194
commit 601767c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -369,6 +369,7 @@ void CheckForConfigChanges()
   if (changed_bits & (CONFIG_CHANGE_BIT_HOST_CONFIG | CONFIG_CHANGE_BIT_MULTISAMPLES))
   {
     OSD::AddMessage("Video config changed, reloading shaders.", OSD::Duration::NORMAL);
+    g_gfx->WaitForGPUIdle();
     g_vertex_manager->InvalidatePipelineObject();
     g_vertex_manager->NotifyCustomShaderCacheOfHostChange(new_host_config);
     g_shader_cache->SetHostConfig(new_host_config);