aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/renderer_vulkan/renderer_vulkan.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/renderer_vulkan/renderer_vulkan.h')
-rw-r--r--src/video_core/renderer_vulkan/renderer_vulkan.h27
1 files changed, 16 insertions, 11 deletions
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
- vk::Instance instance;
- // RAII wrapper for instance
- ManagedInstance managed_instance;
+ // 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;
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