From ce5d5d2aff50f9ce8159d609824eb2391bed9ef2 Mon Sep 17 00:00:00 2001
From: MrPurple666 <mrpurple666@noreply.localhost>
Date: Sun, 18 May 2025 17:45:32 +0000
Subject: THIS NEEDS TO BE CHECKED BEFORE MERGE: RAII fix, initial MSAA, some
 fixes for memory misallocation (#116)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• MSAA Fixes: Fixes upload/download for MSAA textures using temporary non-MSAA images. Ensures compatibility with color formats and adds fallbacks for depth/stencil.
• Memory fix misallocation: Adds checks for null/zero-length operations in memory management and improves cleanup to avoid crashes (Related to crash issues due to misallocation, RP5 and 865)
• Vulkan Initialization (RAII): this almost rewrites the way vulkan initializes to avoid crashes, using a correct order now (thanks @crueter  for the initial fix)

•Please check before merging:
- Test MSAA workflows (especially color/depth transitions and low memory cases).
- Verify memory operations (e.g., unmapping zero-length regions).
- Check Vulkan object lifetimes and platform-specific behavior.
- Check others plataforms beyond android

Why is everything in one PR? Otherwise, this is all a big fix, by checking the points above we can create a branch for each one and check them by themselves. I'm not standing still while I'm away, I'm just out of time for now.

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/116
Co-authored-by: MrPurple666 <mrpurple666@noreply.localhost>
Co-committed-by: MrPurple666 <mrpurple666@noreply.localhost>
---
 src/video_core/renderer_vulkan/renderer_vulkan.cpp | 48 ++++++++--------------
 1 file changed, 17 insertions(+), 31 deletions(-)

(limited to 'src/video_core/renderer_vulkan/renderer_vulkan.cpp')

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());
-- 
cgit v1.2.3