Merge pull request dolphin-emu#12227 from iwubcode/wait_on_gpu_when_config_changes

AdmiralCurtiss · web-flow · commit 601767c1c868 · 2023-10-11T09:44:20.000+02:00
VideoCommon: wait for the GPU to be finished doing any work before invalidating pipelines when graphics config changes
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);

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ void CheckForConfigChanges()`
`369`	`369`	`if (changed_bits & (CONFIG_CHANGE_BIT_HOST_CONFIG \| CONFIG_CHANGE_BIT_MULTISAMPLES))`
`370`	`370`	`{`
`371`	`371`	`OSD::AddMessage("Video config changed, reloading shaders.", OSD::Duration::NORMAL);`
	`372`	`+ g_gfx->WaitForGPUIdle();`
`372`	`373`	`g_vertex_manager->InvalidatePipelineObject();`
`373`	`374`	`g_vertex_manager->NotifyCustomShaderCacheOfHostChange(new_host_config);`
`374`	`375`	`g_shader_cache->SetHostConfig(new_host_config);`