From d3510b139769cc51b3bd7d583ad727ae882ad4e9 Mon Sep 17 00:00:00 2001
From: MrPurple666 <antoniosacramento666usa@gmail.com>
Date: Sat, 17 May 2025 04:26:34 -0300
Subject: [PATCH] Try fix RAII crash problems

---
 .../renderer_vulkan/renderer_vulkan.cpp       | 48 +++++++------------
 .../renderer_vulkan/renderer_vulkan.h         | 27 ++++++-----
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
index 30f5ff7a75..f5b73d63ef 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
@@ -110,27 +110,16 @@ try
     , device_memory(device_memory_)
     , gpu(gpu_)
     , library(OpenLibrary(context.get()))
-    ,
-    // Create raw Vulkan instance first
-    instance(CreateInstance(*library,
-                            dld,
-                            VK_API_VERSION_1_1,
-                            render_window.GetWindowInfo().type,
-                            Settings::values.renderer_debug.GetValue()))
-    ,
-    // Now create RAII wrappers for the resources in the correct order
-    managed_instance(MakeManagedInstance(instance, dld))
-    ,
-    // Create debug messenger if debug is enabled
-    debug_messenger(Settings::values.renderer_debug ? CreateDebugUtilsCallback(instance)
-                                                    : vk::DebugUtilsMessenger{})
-    , managed_debug_messenger(Settings::values.renderer_debug
-                                  ? MakeManagedDebugUtilsMessenger(debug_messenger, instance, dld)
-                                  : ManagedDebugUtilsMessenger{})
-    ,
-    // Create surface
-    surface(CreateSurface(instance, render_window.GetWindowInfo()))
-    , managed_surface(MakeManagedSurface(surface, instance, dld))
+    , dld()
+    // Initialize resources in the same order as they are declared in the header
+    , instance(CreateInstance(*library,
+                           dld,
+                           VK_API_VERSION_1_1,
+                           render_window.GetWindowInfo().type,
+                           Settings::values.renderer_debug.GetValue()))
+    , debug_messenger(Settings::values.renderer_debug ? CreateDebugUtilsCallback(instance)
+                                                     : vk::DebugUtilsMessenger{})
+    , surface(CreateSurface(instance, render_window.GetWindowInfo()))
     , device(CreateDevice(instance, dld, *surface))
     , memory_allocator(device)
     , state_tracker()
@@ -172,22 +161,19 @@ try
                   scheduler,
                   PresentFiltersForAppletCapture)
     , rasterizer(render_window, gpu, device_memory, device, memory_allocator, state_tracker, scheduler)
-    , applet_frame() {
+    , turbo_mode()
+    , applet_frame()
+    , managed_instance(MakeManagedInstance(instance, dld))
+    , managed_debug_messenger(Settings::values.renderer_debug
+                                ? MakeManagedDebugUtilsMessenger(debug_messenger, instance, dld)
+                                : ManagedDebugUtilsMessenger{})
+    , managed_surface(MakeManagedSurface(surface, instance, dld)) {
 
     if (Settings::values.renderer_force_max_clock.GetValue() && device.ShouldBoostClocks()) {
         turbo_mode.emplace(instance, dld);
         scheduler.RegisterOnSubmit([this] { turbo_mode->QueueSubmitted(); });
     }
 
-#ifndef ANDROID
-    // Release ownership from the old instance and surface
-    instance.release();
-    surface.release();
-    if (Settings::values.renderer_debug) {
-        debug_messenger.release();
-    }
-#endif
-
     Report();
 } catch (const vk::Exception& exception) {
     LOG_ERROR(Render_Vulkan, "Vulkan initialization failed with error: {}", exception.what());
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.h b/src/video_core/renderer_vulkan/renderer_vulkan.h
index c1e6d5db7f..ec4215253f 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.h
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.h
@@ -76,32 +76,37 @@ private:
     std::shared_ptr<Common::DynamicLibrary> library;
     vk::InstanceDispatch dld;
 
-    // Keep original handles for compatibility with existing code
+    // Order of member variables determines destruction order (reverse of declaration)
+    // Critical Vulkan resources should be declared in proper dependency order
+
+    // Base Vulkan instance, debugging, and surface
     vk::Instance instance;
-    // RAII wrapper for instance
-    ManagedInstance managed_instance;
-
     vk::DebugUtilsMessenger debug_messenger;
-    // RAII wrapper for debug messenger
-    ManagedDebugUtilsMessenger managed_debug_messenger;
-
     vk::SurfaceKHR surface;
-    // RAII wrapper for surface
-    ManagedSurface managed_surface;
-
+    
+    // Device and core resources
     Device device;
     MemoryAllocator memory_allocator;
     StateTracker state_tracker;
     Scheduler scheduler;
     Swapchain swapchain;
     PresentManager present_manager;
+
+    // Rendering components
     BlitScreen blit_swapchain;
     BlitScreen blit_capture;
     BlitScreen blit_applet;
     RasterizerVulkan rasterizer;
-    std::optional<TurboMode> turbo_mode;
 
+    // Optional components
+    std::optional<TurboMode> turbo_mode;
     Frame applet_frame;
+    
+    // RAII wrappers - must be destroyed before their raw handles
+    // so they are declared after to be destroyed first
+    ManagedInstance managed_instance;
+    ManagedDebugUtilsMessenger managed_debug_messenger;
+    ManagedSurface managed_surface;
 };
 
 } // namespace Vulkan