zzre: Fix three Vulkan validations related to cleanup

Helco · Mar 8, 2024 · 5b46802 · 5b46802
1 parent 7575080
commit 5b46802
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/zzre.core/imgui/WindowContainer.cs b/zzre.core/imgui/WindowContainer.cs
@@ -74,6 +74,9 @@ protected override void DisposeManaged()
         base.DisposeManaged();
         foreach (var window in this.ToArray())
             window.Dispose();
+        onceBeforeUpdate.Invoke();
+        onceAfterUpdate.Invoke(); // Window Tags like FramebufferArea will defer disposal
+
         ImGuiRenderer.Dispose();
         commandList.Dispose();
         if (!fence.Signaled)

diff --git a/zzre/Program.cs b/zzre/Program.cs
@@ -172,6 +172,9 @@ private static void CommonCleanup(ITagContainer diContainer)
         diContainer.TryGetTag(out GraphicsDevice graphicsDevice);
         diContainer.TryGetTag(out Sdl sdl);
         diContainer.TryGetTag(out OpenALDevice openALDevice);
+
+        graphicsDevice.WaitForIdle(); // otherwise Vulkan Validation is not happy about us destroying textures
+
         diContainer.RemoveTag<GraphicsDevice>(dispose: false);
         diContainer.RemoveTag<Sdl>(dispose: false);
         diContainer.RemoveTag<OpenALDevice>(dispose: false);

diff --git a/zzre/game/UI.cs b/zzre/game/UI.cs
@@ -97,6 +97,7 @@ protected override void DisposeManaged()
         renderSystems.Dispose();
         tagContainer.Dispose();
         assetRegistry.Dispose();
+        ProjectionBuffer.Dispose();
         zzContainer.OnResize -= HandleResize;
     }