wip

Signed-off-by: lizzie <lizzie@eden-emu.dev>

.patch/vulkan-memory-allocator/0001-macos-clang.patch

@@ -0,0 +1,112 @@
+diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
+index 8df0364..4856064 100644
+--- a/include/vk_mem_alloc.h
++++ b/include/vk_mem_alloc.h
+@@ -3017,7 +3017,7 @@ remove them if not needed.
+ 
+ #if defined(__ANDROID_API__) && (__ANDROID_API__ < 16)
+ #include <cstdlib>
+-static void* vma_aligned_alloc(size_t alignment, size_t size)
++static inline void* vma_aligned_alloc(size_t alignment, size_t size)
+ {
+     // alignment must be >= sizeof(void*)
+     if(alignment < sizeof(void*))
+@@ -3860,7 +3860,7 @@ Returned value is the found element, if present in the collection or place where
+ new element with value (key) should be inserted.
+ */
+ template <typename CmpLess, typename IterT, typename KeyT>
+-static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT& key, const CmpLess& cmp)
++static inline IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT& key, const CmpLess& cmp)
+ {
+     size_t down = 0;
+     size_t up = size_t(end - beg);
+@@ -3898,7 +3898,7 @@ Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT.
+ T must be pointer type, e.g. VmaAllocation, VmaPool.
+ */
+ template<typename T>
+-static bool VmaValidatePointerArray(uint32_t count, const T* arr)
++static inline bool VmaValidatePointerArray(uint32_t count, const T* arr)
+ {
+     for (uint32_t i = 0; i < count; ++i)
+     {
+@@ -4188,13 +4188,13 @@ static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr
+ }
+ 
+ template<typename T>
+-static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks)
++static inline T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks)
+ {
+     return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T));
+ }
+ 
+ template<typename T>
+-static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count)
++static inline T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count)
+ {
+     return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T));
+ }
+@@ -4204,14 +4204,14 @@ static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, si
+ #define vma_new_array(allocator, type, count)   new(VmaAllocateArray<type>((allocator), (count)))(type)
+ 
+ template<typename T>
+-static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr)
++static inline void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr)
+ {
+     ptr->~T();
+     VmaFree(pAllocationCallbacks, ptr);
+ }
+ 
+ template<typename T>
+-static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count)
++static inline void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count)
+ {
+     if (ptr != VMA_NULL)
+     {
+@@ -4658,13 +4658,13 @@ void VmaVector<T, AllocatorT>::remove(size_t index)
+ #endif // _VMA_VECTOR_FUNCTIONS
+ 
+ template<typename T, typename allocatorT>
+-static void VmaVectorInsert(VmaVector<T, allocatorT>& vec, size_t index, const T& item)
++static inline void VmaVectorInsert(VmaVector<T, allocatorT>& vec, size_t index, const T& item)
+ {
+     vec.insert(index, item);
+ }
+ 
+ template<typename T, typename allocatorT>
+-static void VmaVectorRemove(VmaVector<T, allocatorT>& vec, size_t index)
++static inline void VmaVectorRemove(VmaVector<T, allocatorT>& vec, size_t index)
+ {
+     vec.remove(index);
+ }
+@@ -10620,19 +10620,19 @@ static void VmaFree(VmaAllocator hAllocator, void* ptr)
+ }
+ 
+ template<typename T>
+-static T* VmaAllocate(VmaAllocator hAllocator)
++static inline T* VmaAllocate(VmaAllocator hAllocator)
+ {
+     return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T));
+ }
+ 
+ template<typename T>
+-static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count)
++static inline T* VmaAllocateArray(VmaAllocator hAllocator, size_t count)
+ {
+     return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T));
+ }
+ 
+ template<typename T>
+-static void vma_delete(VmaAllocator hAllocator, T* ptr)
++static inline void vma_delete(VmaAllocator hAllocator, T* ptr)
+ {
+     if(ptr != VMA_NULL)
+     {
+@@ -10642,7 +10642,7 @@ static void vma_delete(VmaAllocator hAllocator, T* ptr)
+ }
+ 
+ template<typename T>
+-static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)
++static inline void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)
+ {
+     if(ptr != VMA_NULL)
+     {

CMakeLists.txt

@@ -3,6 +3,7 @@
 
 cmake_minimum_required(VERSION 3.31)
 
+set(CMAKE_OSX_DEPLOYMENT_TARGET "15.0" CACHE STRING "macOS deployment target")
 project(yuzu)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
@@ -512,7 +513,7 @@ endfunction()
 # =============================================
 
 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers Foundation)
         find_library(${fw}_LIBRARY ${fw} REQUIRED)
         list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
     endforeach()

cpmfile.json

@@ -1,12 +1,4 @@
 {
-    "": {
-        "ci": true,
-        "hash": "9f50d993c39529e022ad456163de91ac5934e16faf8fc348f305355fc0a643c534f87ded707e11bd03bcbc0a1760bd20852b6533a67ac0558a078385181cb184",
-        "name": "SDL3",
-        "package": "SDL3",
-        "repo": "crueter-ci/SDL3",
-        "version": "3.4.14-1788231389-147a8ee32d"
-    },
     "biscuit": {
         "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
         "min_version": "0.9.1",
@@ -68,10 +60,10 @@
     },
     "discord-rpc": {
         "find_args": "MODULE",
-        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
+        "hash": "8d680b3a16d6f6bf292ad823cf8635595ff986f2a49f758e3009f505b540a9d75194a8cf44cddea75736a8c3e3b5160166e716a0939ce3f18cc463cf648753fe",
         "package": "DiscordRPC",
         "repo": "eden-emulator/discord-rpc",
-        "version": "0d8b2d6a37"
+        "version": "76616d8675"
     },
     "enet": {
         "find_args": "MODULE",
@@ -311,6 +303,9 @@
         "find_args": "CONFIG",
         "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
         "package": "VulkanMemoryAllocator",
+        "patches": [
+            "0001-macos-clang.patch"
+        ],
         "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
         "version": "v3.3.0"
     },

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -83,6 +83,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SHOW_SHADERS_BUILDING("show_shaders_building"),
 
     DEBUG_FLUSH_BY_LINE("flush_line"),
+    EXTENDED_LOGGING("extended_logging"),
     DONT_SHOW_DRIVER_SHADER_WARNING("dont_show_driver_shader_warning"),
     ENABLE_OVERLAY("enable_overlay"),
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -262,6 +262,13 @@ abstract class SettingsItem(
                     descriptionId = R.string.flush_by_line_description
                 )
             )
+            put(
+                SwitchSetting(
+                    BooleanSetting.EXTENDED_LOGGING,
+                    titleId = R.string.extended_logging,
+                    descriptionId = R.string.extended_logging_description
+                )
+            )
 
             val dockedModeSetting = object : AbstractBooleanSetting {
                 override val key = BooleanSetting.USE_DOCKED_MODE.key

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -1323,6 +1323,7 @@ class SettingsFragmentPresenter(
                 add(HeaderSetting(R.string.log))
 
                 add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
+                add(BooleanSetting.EXTENDED_LOGGING.key)
                 add(StringSetting.LOG_FILTER.key)
             }
 

src/android/app/src/main/res/values-fa/strings.xml

@@ -750,8 +750,6 @@
 
     <!-- Anti-Aliasing -->
     <string name="anti_aliasing_none">هیچ</string>
-    <string name="anti_aliasing_fxaa">FXAA</string>
-    <string name="anti_aliasing_smaa">SMAA</string>
 
     <!-- Screen Layouts -->
     <string name="screen_layout_auto">خودکار</string>

src/android/app/src/main/res/values/arrays.xml

@@ -301,6 +301,7 @@
         <item>@string/anti_aliasing_none</item>
         <item>@string/anti_aliasing_fxaa</item>
         <item>@string/anti_aliasing_smaa</item>
+        <item>@string/anti_aliasing_ssaa</item>
     </string-array>
 
     <integer-array name="rendererAntiAliasingValues">

src/android/app/src/main/res/values/strings.xml

@@ -636,6 +636,8 @@
     <string name="log">Logging</string>
     <string name="flush_by_line">Flush debug logs by line</string>
     <string name="flush_by_line_description">Flushes debugging logs on each line written, making debugging easier in cases of crashing or freezing.</string>
+    <string name="extended_logging">Enable extended logging</string>
+    <string name="extended_logging_description">Increases the maximum log file size from 100 MiB to 1 GiB.</string>
     <string name="log_filter">Log filter</string>
     <string name="log_filter_description">Controls Eden\'s log categories. Example: *:Info Service.LM:Debug</string>
 
@@ -1165,6 +1167,7 @@
     <string name="anti_aliasing_none">None</string>
     <string name="anti_aliasing_fxaa" translatable="false">FXAA</string>
     <string name="anti_aliasing_smaa" translatable="false">SMAA</string>
+    <string name="anti_aliasing_smaa" translatable="false">SSAA</string>
 
     <!-- Screen Layouts -->
     <string name="screen_layout_auto">Auto</string>

src/common/scratch_buffer.h

@@ -1,9 +1,13 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <iterator>
+#include <cstring>
 
 #include "common/make_unique_for_overwrite.h"
 
@@ -61,7 +65,7 @@ public:
     void resize(size_type size) {
         if (size > buffer_capacity) {
             auto new_buffer = Common::make_unique_for_overwrite<T[]>(size);
-            std::move(buffer.get(), buffer.get() + buffer_capacity, new_buffer.get());
+            std::memcpy(new_buffer.get(), buffer.get(), buffer_capacity * sizeof(T));
             buffer = std::move(new_buffer);
             buffer_capacity = size;
         }

src/common/settings_enums.h

@@ -147,7 +147,7 @@ ENUM(FullscreenMode, Borderless, Exclusive);
 ENUM(NvdecEmulation, Off, Cpu, Gpu);
 ENUM(ResolutionSetup, Res1_4X, Res1_2X, Res3_4X, Res1X, Res5_4X, Res3_2X, Res2X, Res3X, Res4X, Res5X, Res6X, Res7X, Res8X);
 ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, ScaleForce, Fsr, Area, ZeroTangent, BSpline, Mitchell, Spline1, Mmpx, Sgsr, SgsrEdge);
-ENUM(AntiAliasing, None, Fxaa, Smaa);
+ENUM(AntiAliasing, None, Fxaa, Smaa, Ssaa);
 ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
 ENUM(ConsoleMode, Handheld, Docked);
 ENUM(AppletMode, HLE, LLE);

src/common/uuid.h

@@ -10,6 +10,7 @@
 #include <functional>
 #include <span>
 #include <string>
+#include <type_traits>
 
 #include "common/common_types.h"
 

src/core/debugger/debugger.cpp

@@ -6,13 +6,13 @@
 
 #include <mutex>
 #include <utility>
+#include <type_traits>
+
 #include <boost/asio.hpp>
 #include <boost/version.hpp>
-
 #if BOOST_VERSION > 108400 && (!defined(_WINDOWS) && !defined(__ANDROID__)) || defined(YUZU_BOOST_v1)
 #define USE_BOOST_v1
 #endif
-
 #ifdef USE_BOOST_v1
 #include <boost/process/v1/async_pipe.hpp>
 #else

src/core/file_sys/fssystem/fs_types.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <type_traits>
 #include "common/common_funcs.h"
 
 namespace FileSys {

src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <optional>
+#include <type_traits>
 
 #include "common/literals.h"
 #include "core/file_sys/fssystem/fs_i_storage.h"

src/core/file_sys/fssystem/fssystem_bucket_tree.cpp

@@ -4,6 +4,7 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <type_traits>
 #include "core/file_sys/errors.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree_utils.h"

src/core/file_sys/fssystem/fssystem_bucket_tree.h

@@ -1,9 +1,13 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <mutex>
+#include <type_traits>
 
 #include "common/alignment.h"
 #include "common/common_funcs.h"

src/core/file_sys/fssystem/fssystem_bucket_tree_template_impl.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <type_traits>
 #include "core/file_sys/errors.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree_utils.h"

src/core/file_sys/fssystem/fssystem_compressed_storage.h

@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <type_traits>
+#include <cstddef>
 #include "common/literals.h"
 
 #include "core/file_sys/errors.h"

src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h

@@ -1,8 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include <type_traits>
 #include "common/alignment.h"
 #include "core/file_sys/fssystem/fs_i_storage.h"
 #include "core/file_sys/fssystem/fs_types.h"

src/core/file_sys/fssystem/fssystem_indirect_storage.h

@@ -6,6 +6,9 @@
 
 #pragma once
 
+#include <type_traits>
+#include <array>
+#include <cstddef>
 #include "core/file_sys/errors.h"
 #include "core/file_sys/fssystem/fs_i_storage.h"
 #include "core/file_sys/fssystem/fssystem_bucket_tree.h"

src/core/file_sys/fssystem/fssystem_integrity_verification_storage.h

@@ -1,9 +1,15 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <optional>
+#include <array>
+#include <cstddef>
+#include <type_traits>
 
 #include "core/file_sys/fssystem/fs_i_storage.h"
 #include "core/file_sys/fssystem/fs_types.h"

src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <type_traits>
+#include <cstddef>
 #include "core/file_sys/fssystem/fssystem_compression_common.h"
 #include "core/file_sys/fssystem/fssystem_nca_header.h"
 #include "core/file_sys/vfs/vfs.h"

src/core/file_sys/fssystem/fssystem_nca_header.h

@@ -1,8 +1,14 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include <type_traits>
+#include <array>
+#include <cstddef>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/literals.h"

src/core/hle/kernel/k_page_table_base.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <memory>
+#include <type_traits>
 
 #include "common/common_funcs.h"
 #include "common/page_table.h"

src/core/hle/result.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <type_traits>
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/common_funcs.h"

src/core/hle/service/bcat/bcat_types.h

@@ -1,9 +1,13 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
 #include <array>
+#include <type_traits>
 #include <functional>
 
 #include "common/common_funcs.h"

src/core/hle/service/caps/caps_manager.cpp

@@ -175,19 +175,10 @@ Result AlbumManager::LoadAlbumScreenShotImage(LoadAlbumScreenShotImageOutput& ou
         return ResultIsNotMounted;
     }
 
-    out_image_output = {
-        .width = 1280,
-        .height = 720,
-        .attribute =
-            {
-                .unknown_0{},
-                .orientation = AlbumImageOrientation::None,
-                .unknown_1{},
-                .unknown_2{},
-                .pad163{},
-            },
-        .pad179{},
-    };
+    out_image_output = {};
+    out_image_output.width = 1280;
+    out_image_output.height = 720;
+    out_image_output.attribute.orientation = AlbumImageOrientation::None;
 
     std::filesystem::path path;
     const auto result = GetFile(path, file_id);
@@ -211,19 +202,10 @@ Result AlbumManager::LoadAlbumScreenShotThumbnail(
         return ResultIsNotMounted;
     }
 
-    out_image_output = {
-        .width = 320,
-        .height = 180,
-        .attribute =
-            {
-                .unknown_0{},
-                .orientation = AlbumImageOrientation::None,
-                .unknown_1{},
-                .unknown_2{},
-                .pad163{},
-            },
-        .pad179{},
-    };
+    out_image_output = {};
+    out_image_output.width = 320;
+    out_image_output.height = 180;
+    out_image_output.attribute.orientation = AlbumImageOrientation::None;
 
     std::filesystem::path path;
     const auto result = GetFile(path, file_id);

src/core/hle/service/caps/caps_su.cpp

@@ -73,13 +73,8 @@ void IScreenShotApplicationService::CaptureAndSaveScreenshot(AlbumReportOption r
     Layout::FramebufferLayout layout =
         Layout::DefaultFrameLayout(screenshot_width, screenshot_height);
 
-    const Capture::ScreenShotAttribute attribute{
-        .unknown_0{},
-        .orientation = Capture::AlbumImageOrientation::None,
-        .unknown_1{},
-        .unknown_2{},
-        .pad163{},
-    };
+    Capture::ScreenShotAttribute attribute{};
+    attribute.orientation = Capture::AlbumImageOrientation::None;
 
     renderer.RequestScreenshot(
         image_data.data(),

src/core/hle/service/caps/caps_types.h

@@ -1,8 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include <type_traits>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 

src/core/hle/service/ldn/ldn_types.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <type_traits>
 #include <fmt/ranges.h>
 
 #include "common/common_funcs.h"

src/core/hle/service/psc/time/common.h

@@ -8,6 +8,7 @@
 
 #include <array>
 #include <chrono>
+#include <type_traits>
 #include <fmt/ranges.h>
 
 #include "common/common_types.h"

src/core/hle/service/psc/time/shared_memory.h

@@ -1,10 +1,13 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <array>
-
+#include <type_traits>
 #include "common/common_types.h"
 #include "core/hle/service/psc/time/common.h"
 

src/core/hle/service/set/settings_types.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <array>
+#include <type_traits>
 
 #include "common/bit_field.h"
 #include "common/common_funcs.h"

src/hid_core/hid_types.h

@@ -1,8 +1,15 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include <cstddef>
+#include <array>
+#include <type_traits>
+
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"

src/qt_common/config/shared_translation.cpp

@@ -505,6 +505,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
                               PAIR(AntiAliasing, None, tr("None")),
                               PAIR(AntiAliasing, Fxaa, tr("FXAA")),
                               PAIR(AntiAliasing, Smaa, tr("SMAA")),
+                              PAIR(AntiAliasing, Ssaa, tr("SSAA")),
                           }});
     translations->insert({Settings::EnumMetadata<Settings::AspectRatio>::Index(),
                           {

src/qt_common/config/shared_translation.h

@@ -31,6 +31,7 @@ static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map =
     {Settings::AntiAliasing::None, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "None"))},
     {Settings::AntiAliasing::Fxaa, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "FXAA"))},
     {Settings::AntiAliasing::Smaa, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "SMAA"))},
+    {Settings::AntiAliasing::Ssaa, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "SSAA"))},
 };
 
 static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map = {

src/shader_recompiler/CMakeLists.txt

@@ -6,55 +6,6 @@
 
 add_library(shader_recompiler STATIC
     backend/bindings.h
-    backend/glasm/emit_glasm.cpp
-    backend/glasm/emit_glasm.h
-    backend/glasm/emit_glasm_barriers.cpp
-    backend/glasm/emit_glasm_bitwise_conversion.cpp
-    backend/glasm/emit_glasm_composite.cpp
-    backend/glasm/emit_glasm_context_get_set.cpp
-    backend/glasm/emit_glasm_control_flow.cpp
-    backend/glasm/emit_glasm_convert.cpp
-    backend/glasm/emit_glasm_floating_point.cpp
-    backend/glasm/emit_glasm_image.cpp
-    backend/glasm/emit_glasm_instructions.h
-    backend/glasm/emit_glasm_integer.cpp
-    backend/glasm/emit_glasm_logical.cpp
-    backend/glasm/emit_glasm_memory.cpp
-    backend/glasm/emit_glasm_not_implemented.cpp
-    backend/glasm/emit_glasm_select.cpp
-    backend/glasm/emit_glasm_shared_memory.cpp
-    backend/glasm/emit_glasm_special.cpp
-    backend/glasm/emit_glasm_undefined.cpp
-    backend/glasm/emit_glasm_warp.cpp
-    backend/glasm/glasm_emit_context.cpp
-    backend/glasm/glasm_emit_context.h
-    backend/glasm/reg_alloc.cpp
-    backend/glasm/reg_alloc.h
-    backend/glsl/emit_glsl.cpp
-    backend/glsl/emit_glsl.h
-    backend/glsl/emit_glsl_atomic.cpp
-    backend/glsl/emit_glsl_barriers.cpp
-    backend/glsl/emit_glsl_bitwise_conversion.cpp
-    backend/glsl/emit_glsl_composite.cpp
-    backend/glsl/emit_glsl_context_get_set.cpp
-    backend/glsl/emit_glsl_control_flow.cpp
-    backend/glsl/emit_glsl_convert.cpp
-    backend/glsl/emit_glsl_floating_point.cpp
-    backend/glsl/emit_glsl_image.cpp
-    backend/glsl/emit_glsl_instructions.h
-    backend/glsl/emit_glsl_integer.cpp
-    backend/glsl/emit_glsl_logical.cpp
-    backend/glsl/emit_glsl_memory.cpp
-    backend/glsl/emit_glsl_not_implemented.cpp
-    backend/glsl/emit_glsl_select.cpp
-    backend/glsl/emit_glsl_shared_memory.cpp
-    backend/glsl/emit_glsl_special.cpp
-    backend/glsl/emit_glsl_undefined.cpp
-    backend/glsl/emit_glsl_warp.cpp
-    backend/glsl/glsl_emit_context.cpp
-    backend/glsl/glsl_emit_context.h
-    backend/glsl/var_alloc.cpp
-    backend/glsl/var_alloc.h
     backend/spirv/emit_spirv.cpp
     backend/spirv/emit_spirv.h
     backend/spirv/emit_spirv_atomic.cpp
@@ -239,9 +190,60 @@ add_library(shader_recompiler STATIC
     program_header.h
     runtime_info.h
     shader_info.h
-    varying_state.h
+    varying_state.h)
 
-)
+if (ENABLE_OPENGL)
+    target_sources(shader_recompiler PRIVATE
+        backend/glasm/emit_glasm.cpp
+        backend/glasm/emit_glasm.h
+        backend/glasm/emit_glasm_barriers.cpp
+        backend/glasm/emit_glasm_bitwise_conversion.cpp
+        backend/glasm/emit_glasm_composite.cpp
+        backend/glasm/emit_glasm_context_get_set.cpp
+        backend/glasm/emit_glasm_control_flow.cpp
+        backend/glasm/emit_glasm_convert.cpp
+        backend/glasm/emit_glasm_floating_point.cpp
+        backend/glasm/emit_glasm_image.cpp
+        backend/glasm/emit_glasm_instructions.h
+        backend/glasm/emit_glasm_integer.cpp
+        backend/glasm/emit_glasm_logical.cpp
+        backend/glasm/emit_glasm_memory.cpp
+        backend/glasm/emit_glasm_not_implemented.cpp
+        backend/glasm/emit_glasm_select.cpp
+        backend/glasm/emit_glasm_shared_memory.cpp
+        backend/glasm/emit_glasm_special.cpp
+        backend/glasm/emit_glasm_undefined.cpp
+        backend/glasm/emit_glasm_warp.cpp
+        backend/glasm/glasm_emit_context.cpp
+        backend/glasm/glasm_emit_context.h
+        backend/glasm/reg_alloc.cpp
+        backend/glasm/reg_alloc.h
+        backend/glsl/emit_glsl.cpp
+        backend/glsl/emit_glsl.h
+        backend/glsl/emit_glsl_atomic.cpp
+        backend/glsl/emit_glsl_barriers.cpp
+        backend/glsl/emit_glsl_bitwise_conversion.cpp
+        backend/glsl/emit_glsl_composite.cpp
+        backend/glsl/emit_glsl_context_get_set.cpp
+        backend/glsl/emit_glsl_control_flow.cpp
+        backend/glsl/emit_glsl_convert.cpp
+        backend/glsl/emit_glsl_floating_point.cpp
+        backend/glsl/emit_glsl_image.cpp
+        backend/glsl/emit_glsl_instructions.h
+        backend/glsl/emit_glsl_integer.cpp
+        backend/glsl/emit_glsl_logical.cpp
+        backend/glsl/emit_glsl_memory.cpp
+        backend/glsl/emit_glsl_not_implemented.cpp
+        backend/glsl/emit_glsl_select.cpp
+        backend/glsl/emit_glsl_shared_memory.cpp
+        backend/glsl/emit_glsl_special.cpp
+        backend/glsl/emit_glsl_undefined.cpp
+        backend/glsl/emit_glsl_warp.cpp
+        backend/glsl/glsl_emit_context.cpp
+        backend/glsl/glsl_emit_context.h
+        backend/glsl/var_alloc.cpp
+        backend/glsl/var_alloc.h)
+endif()
 
 target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit)
 

src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp

@@ -553,17 +553,6 @@ void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateIn
     }
 }
 
-template <typename Descriptors, typename Descriptor, typename Func>
-static u32 Add(Descriptors& descriptors, const Descriptor& desc, Func&& pred) {
-    // TODO: Handle arrays
-    const auto it{std::ranges::find_if(descriptors, pred)};
-    if (it != descriptors.end()) {
-        return static_cast<u32>(std::distance(descriptors.begin(), it));
-    }
-    descriptors.push_back(desc);
-    return static_cast<u32>(descriptors.size()) - 1;
-}
-
 void JoinStorageInfo(Info& base, Info& source) {
     auto& descriptors = base.storage_buffers_descriptors;
     for (auto& desc : source.storage_buffers_descriptors) {

src/video_core/CMakeLists.txt

@@ -125,6 +125,8 @@ add_library(video_core STATIC
     renderer_vulkan/present/fsr.h
     renderer_vulkan/present/fxaa.cpp
     renderer_vulkan/present/fxaa.h
+    renderer_vulkan/present/ssaa.cpp
+    renderer_vulkan/present/ssaa.h
     renderer_vulkan/present/layer.cpp
     renderer_vulkan/present/layer.h
     renderer_vulkan/present/present_push_constants.h

src/video_core/host1x/codec_types.h

@@ -8,6 +8,7 @@
 
 #include <array>
 #include <vector>
+#include <type_traits>
 
 #include "common/bit_field.h"
 #include "common/common_funcs.h"

src/video_core/host1x/nvdec_common.h

@@ -1,8 +1,15 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include <array>
+#include <cstddef>
+#include <type_traits>
+
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"

src/video_core/host1x/vic.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <memory>
+#include <type_traits>
 
 #include "common/common_types.h"
 #include "common/scratch_buffer.h"

src/video_core/host_shaders/CMakeLists.txt

@@ -70,6 +70,8 @@ set(SHADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/smaa_blending_weight_calculation.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/smaa_neighborhood_blending.vert
     ${CMAKE_CURRENT_SOURCE_DIR}/smaa_neighborhood_blending.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/ssaa.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/ssaa.vert
     ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_blit_depth_stencil.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_color_clear.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/vulkan_color_clear.vert

src/video_core/host_shaders/ssaa.frag

@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#version 460
+#extension GL_ARB_sample_shading : enable
+
+#ifdef VULKAN
+#define BINDING_COLOR_TEXTURE 1
+#else // ^^^ Vulkan ^^^ // vvv OpenGL vvv
+#define BINDING_COLOR_TEXTURE 0
+#endif
+
+layout (location = 0) out vec4 frag_color;
+layout (binding = BINDING_COLOR_TEXTURE) uniform sampler2DMS input_texture;
+
+void main() {
+    frag_color = texelFetch(input_texture, ivec2(gl_FragCoord.xy), gl_SampleID);
+}

src/video_core/host_shaders/ssaa.vert

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#version 450
+
+#ifdef VULKAN
+#define VERTEX_ID gl_VertexIndex
+#define FLIPY 1
+#else // ^^^ Vulkan ^^^ // vvv OpenGL vvv
+#define VERTEX_ID gl_VertexID
+#define FLIPY -1
+out gl_PerVertex {
+    vec4 gl_Position;
+};
+#endif
+
+void main() {
+    float x = float((VERTEX_ID & 1) << 2);
+    float y = float((VERTEX_ID & 2) << 1);
+    gl_Position = vec4(x - 1.0, FLIPY * (y - 1.0), 0.0, 1.0);
+}

src/video_core/renderer_vulkan/present/layer.cpp

@@ -113,6 +113,8 @@ void Layer::ConfigureDraw(const Device& device, PresentPushConstants* out_push_c
         fxaa->Draw(device, scheduler, image_index, &source_image, &source_image_view);
     } else if (auto* smaa = std::get_if<SMAA>(&anti_alias)) {
         smaa->Draw(device, scheduler, image_index, &source_image, &source_image_view);
+    } else if (auto* ssaa = std::get_if<SSAA>(&anti_alias)) {
+        ssaa->Draw(device, scheduler, image_index, &source_image, &source_image_view);
     }
 
     auto crop_rect = Tegra::NormalizeCrop(framebuffer, texture_width, texture_height);
@@ -208,6 +210,9 @@ void Layer::SetAntiAliasPass(const Device& device) {
     case Settings::AntiAliasing::Smaa:
         anti_alias.emplace<SMAA>(device, memory_allocator, image_count, render_area);
         break;
+    case Settings::AntiAliasing::Ssaa:
+        anti_alias.emplace<SSAA>(device, memory_allocator, image_count, render_area);
+        break;
     default:
         anti_alias.emplace<std::monostate>();
         break;

src/video_core/renderer_vulkan/present/layer.h

@@ -16,6 +16,7 @@
 #include "video_core/renderer_vulkan/present/sgsr.h"
 #include "video_core/renderer_vulkan/present/fxaa.h"
 #include "video_core/renderer_vulkan/present/smaa.h"
+#include "video_core/renderer_vulkan/present/ssaa.h"
 
 namespace Layout {
 struct FramebufferLayout;
@@ -93,7 +94,7 @@ private:
     Service::android::PixelFormat pixel_format{};
 
     Settings::AntiAliasing anti_alias_setting{};
-    std::variant<std::monostate, FXAA, SMAA> anti_alias{};
+    std::variant<std::monostate, FXAA, SMAA, SSAA> anti_alias{};
     std::variant<std::monostate, SGSR, FSR> sr_filter{};
     std::vector<u64> resource_ticks{};
 };

src/video_core/renderer_vulkan/present/ssaa.cpp

@@ -0,0 +1,316 @@
+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "common/common_types.h"
+
+#include "video_core/host_shaders/ssaa_frag_spv.h"
+#include "video_core/host_shaders/ssaa_vert_spv.h"
+#include "video_core/renderer_vulkan/present/ssaa.h"
+#include "video_core/renderer_vulkan/present/util.h"
+#include "video_core/renderer_vulkan/vk_scheduler.h"
+#include "video_core/renderer_vulkan/vk_shader_util.h"
+#include "video_core/vulkan_common/vulkan_device.h"
+#include "vulkan/vulkan_core.h"
+
+namespace Vulkan {
+
+SSAA::SSAA(const Device& device, MemoryAllocator& allocator, size_t image_count, VkExtent2D extent)
+    : m_device(device), m_allocator(allocator), m_extent(extent)
+    , m_image_count(u32(image_count))
+{
+    CreateImages();
+    CreateRenderPasses();
+    CreateSampler();
+    CreateShaders();
+    CreateDescriptorPool();
+    CreateDescriptorSetLayouts();
+    CreateDescriptorSets();
+    CreatePipelineLayouts();
+    CreatePipelines();
+}
+
+SSAA::~SSAA() = default;
+
+void SSAA::CreateImages() {
+    for (u32 i = 0; i < m_image_count; i++) {
+        Image& image = m_dynamic_images.emplace_back();
+        image.image = m_allocator.CreateImage(VkImageCreateInfo{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+            .pNext = nullptr,
+            .flags = 0,
+            .imageType = VK_IMAGE_TYPE_2D,
+            .format = VK_FORMAT_R8G8B8A8_UNORM,
+            .extent = {.width = m_extent.width, .height = m_extent.height, .depth = 1},
+            .mipLevels = 1,
+            .arrayLayers = 1,
+            .samples = VK_SAMPLE_COUNT_2_BIT,
+            .tiling = VK_IMAGE_TILING_OPTIMAL,
+            .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+            .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
+            .queueFamilyIndexCount = 0,
+            .pQueueFamilyIndices = nullptr,
+            .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
+        });
+        image.image_view = CreateWrappedImageView(m_device, image.image, VK_FORMAT_R8G8B8A8_UNORM);
+    }
+}
+
+void SSAA::CreateRenderPasses() {
+    const VkAttachmentDescription attachment{
+        .flags = VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT,
+        .format = VK_FORMAT_R8G8B8A8_UNORM,
+        .samples = VK_SAMPLE_COUNT_2_BIT,
+        .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
+        .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
+        .stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
+        .stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE,
+        .initialLayout = VK_IMAGE_LAYOUT_GENERAL,
+        .finalLayout = VK_IMAGE_LAYOUT_GENERAL,
+    };
+    constexpr VkAttachmentReference color_attachment_ref{
+        .attachment = 0,
+        .layout = VK_IMAGE_LAYOUT_GENERAL,
+    };
+    const VkSubpassDescription subpass_description{
+        .flags = 0,
+        .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
+        .inputAttachmentCount = 0,
+        .pInputAttachments = nullptr,
+        .colorAttachmentCount = 1,
+        .pColorAttachments = &color_attachment_ref,
+        .pResolveAttachments = nullptr,
+        .pDepthStencilAttachment = nullptr,
+        .preserveAttachmentCount = 0,
+        .pPreserveAttachments = nullptr,
+    };
+    constexpr VkSubpassDependency dependency{
+        .srcSubpass = VK_SUBPASS_EXTERNAL,
+        .dstSubpass = 0,
+        .srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+        .dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+        .srcAccessMask = 0,
+        .dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+        .dependencyFlags = 0,
+    };
+    m_renderpass = m_device.GetLogical().CreateRenderPass(VkRenderPassCreateInfo{
+        .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .attachmentCount = 1,
+        .pAttachments = &attachment,
+        .subpassCount = 1,
+        .pSubpasses = &subpass_description,
+        .dependencyCount = 1,
+        .pDependencies = &dependency,
+    });
+    for (auto& image : m_dynamic_images) {
+        image.framebuffer = CreateWrappedFramebuffer(m_device, m_renderpass, image.image_view, m_extent);
+    }
+}
+
+void SSAA::CreateSampler() {
+    m_sampler = CreateWrappedSampler(m_device);
+}
+
+void SSAA::CreateShaders() {
+    m_vertex_shader = CreateWrappedShaderModule(m_device, SSAA_VERT_SPV);
+    m_fragment_shader = CreateWrappedShaderModule(m_device, SSAA_FRAG_SPV);
+}
+
+void SSAA::CreateDescriptorPool() {
+    // 2 descriptors, 1 descriptor set per image
+    m_descriptor_pool = CreateWrappedDescriptorPool(m_device, 2 * m_image_count, m_image_count);
+}
+
+void SSAA::CreateDescriptorSetLayouts() {
+    m_descriptor_set_layout = CreateWrappedDescriptorSetLayout(m_device, {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER});
+}
+
+void SSAA::CreateDescriptorSets() {
+    VkDescriptorSetLayout layout = *m_descriptor_set_layout;
+    for (auto& images : m_dynamic_images)
+        images.descriptor_sets = CreateWrappedDescriptorSets(m_descriptor_pool, {layout});
+}
+
+void SSAA::CreatePipelineLayouts() {
+    m_pipeline_layout = CreateWrappedPipelineLayout(m_device, m_descriptor_set_layout);
+}
+
+void SSAA::CreatePipelines() {
+    constexpr VkPipelineColorBlendAttachmentState color_blend_attachment_disabled{
+        .blendEnable = VK_FALSE,
+        .srcColorBlendFactor = VK_BLEND_FACTOR_ZERO,
+        .dstColorBlendFactor = VK_BLEND_FACTOR_ZERO,
+        .colorBlendOp = VK_BLEND_OP_ADD,
+        .srcAlphaBlendFactor = VK_BLEND_FACTOR_ZERO,
+        .dstAlphaBlendFactor = VK_BLEND_FACTOR_ZERO,
+        .alphaBlendOp = VK_BLEND_OP_ADD,
+        .colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT,
+    };
+    const std::array<VkPipelineShaderStageCreateInfo, 2> shader_stages{{
+        {
+            .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+            .pNext = nullptr,
+            .flags = 0,
+            .stage = VK_SHADER_STAGE_VERTEX_BIT,
+            .module = *m_vertex_shader,
+            .pName = "main",
+            .pSpecializationInfo = nullptr,
+        },
+        {
+            .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+            .pNext = nullptr,
+            .flags = 0,
+            .stage = VK_SHADER_STAGE_FRAGMENT_BIT,
+            .module = *m_fragment_shader,
+            .pName = "main",
+            .pSpecializationInfo = nullptr,
+        },
+    }};
+    constexpr VkPipelineVertexInputStateCreateInfo vertex_input_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .vertexBindingDescriptionCount = 0,
+        .pVertexBindingDescriptions = nullptr,
+        .vertexAttributeDescriptionCount = 0,
+        .pVertexAttributeDescriptions = nullptr,
+    };
+    const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP,
+        .primitiveRestartEnable = m_device.IsMoltenVK() ? VK_TRUE : VK_FALSE,
+    };
+    constexpr VkPipelineViewportStateCreateInfo viewport_state_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .viewportCount = 1,
+        .pViewports = nullptr,
+        .scissorCount = 1,
+        .pScissors = nullptr,
+    };
+    constexpr VkPipelineRasterizationStateCreateInfo rasterization_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .depthClampEnable = VK_FALSE,
+        .rasterizerDiscardEnable = VK_FALSE,
+        .polygonMode = VK_POLYGON_MODE_FILL,
+        .cullMode = VK_CULL_MODE_NONE,
+        .frontFace = VK_FRONT_FACE_CLOCKWISE,
+        .depthBiasEnable = VK_FALSE,
+        .depthBiasConstantFactor = 0.0f,
+        .depthBiasClamp = 0.0f,
+        .depthBiasSlopeFactor = 0.0f,
+        .lineWidth = 1.0f,
+    };
+    const VkPipelineMultisampleStateCreateInfo multisampling_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .rasterizationSamples = VK_SAMPLE_COUNT_2_BIT,
+        .sampleShadingEnable = Settings::values.sample_shading.GetValue() > 0 ? VK_TRUE : VK_FALSE,
+        .minSampleShading = f32(Settings::values.sample_shading.GetValue()) / 100.0f,
+        .pSampleMask = nullptr,
+        .alphaToCoverageEnable = VK_FALSE,
+        .alphaToOneEnable = VK_FALSE,
+    };
+    const VkPipelineColorBlendStateCreateInfo color_blend_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .logicOpEnable = VK_FALSE,
+        .logicOp = VK_LOGIC_OP_COPY,
+        .attachmentCount = 1,
+        .pAttachments = &color_blend_attachment_disabled,
+        .blendConstants = {0.0f, 0.0f, 0.0f, 0.0f},
+    };
+    constexpr std::array dynamic_states{
+        VK_DYNAMIC_STATE_VIEWPORT,
+        VK_DYNAMIC_STATE_SCISSOR,
+    };
+    const VkPipelineDynamicStateCreateInfo dynamic_state_ci{
+        .sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .dynamicStateCount = u32(dynamic_states.size()),
+        .pDynamicStates = dynamic_states.data(),
+    };
+    m_pipeline = m_device.GetLogical().CreateGraphicsPipeline(VkGraphicsPipelineCreateInfo{
+        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+        .pNext = nullptr,
+        .flags = 0,
+        .stageCount = static_cast<u32>(shader_stages.size()),
+        .pStages = shader_stages.data(),
+        .pVertexInputState = &vertex_input_ci,
+        .pInputAssemblyState = &input_assembly_ci,
+        .pTessellationState = nullptr,
+        .pViewportState = &viewport_state_ci,
+        .pRasterizationState = &rasterization_ci,
+        .pMultisampleState = &multisampling_ci,
+        .pDepthStencilState = nullptr,
+        .pColorBlendState = &color_blend_ci,
+        .pDynamicState = &dynamic_state_ci,
+        .layout = *m_pipeline_layout,
+        .renderPass = *m_renderpass,
+        .subpass = 0,
+        .basePipelineHandle = 0,
+        .basePipelineIndex = 0,
+    });
+}
+
+void SSAA::UpdateDescriptorSets(VkImageView image_view, size_t image_index) {
+    Image& image = m_dynamic_images[image_index];
+    std::vector<VkDescriptorImageInfo> image_infos;
+    std::vector<VkWriteDescriptorSet> updates;
+    image_infos.reserve(2);
+    updates.push_back(CreateWriteDescriptorSet(image_infos, *m_sampler, image_view, image.descriptor_sets[0], 0));
+    updates.push_back(CreateWriteDescriptorSet(image_infos, *m_sampler, image_view, image.descriptor_sets[0], 1));
+    m_device.GetLogical().UpdateDescriptorSets(updates, {});
+}
+
+void SSAA::UploadImages(Scheduler& scheduler) {
+    if (!m_images_ready) {
+        m_images_ready = true;
+        scheduler.Record([&](vk::CommandBuffer cmdbuf) {
+            for (auto& image : m_dynamic_images)
+                ClearColorImage(cmdbuf, *image.image);
+        });
+        scheduler.Finish();
+    }
+}
+
+void SSAA::Draw(Scheduler& scheduler, size_t image_index, VkImage* inout_image, VkImageView* inout_image_view) {
+    const Image& image{m_dynamic_images[image_index]};
+    const VkImage input_image{*inout_image};
+    const VkImage output_image{*image.image};
+    const VkDescriptorSet descriptor_set{image.descriptor_sets[0]};
+    const VkFramebuffer framebuffer{*image.framebuffer};
+    const VkRenderPass renderpass{*m_renderpass};
+    const VkPipeline pipeline{*m_pipeline};
+    const VkPipelineLayout layout{*m_pipeline_layout};
+    const VkExtent2D extent{m_extent};
+
+    UploadImages(scheduler);
+    UpdateDescriptorSets(*inout_image_view, image_index);
+
+    scheduler.RequestOutsideRenderPassOperationContext();
+    scheduler.Record([=](vk::CommandBuffer cmdbuf) {
+        TransitionImageLayout(cmdbuf, input_image, VK_IMAGE_LAYOUT_GENERAL);
+        TransitionImageLayout(cmdbuf, output_image, VK_IMAGE_LAYOUT_GENERAL);
+        BeginRenderPass(cmdbuf, renderpass, framebuffer, extent);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set, {});
+        cmdbuf.Draw(3, 1, 0, 0);
+        cmdbuf.EndRenderPass();
+        TransitionImageLayout(cmdbuf, output_image, VK_IMAGE_LAYOUT_GENERAL);
+    });
+
+    *inout_image = *image.image;
+    *inout_image_view = *image.image_view;
+}
+
+} // namespace Vulkan

src/video_core/renderer_vulkan/present/ssaa.h

@@ -0,0 +1,63 @@
+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "video_core/renderer_vulkan/present/anti_alias_pass.h"
+#include "video_core/vulkan_common/vulkan_memory_allocator.h"
+#include "video_core/vulkan_common/vulkan_wrapper.h"
+
+namespace Vulkan {
+
+class Device;
+class Scheduler;
+class StagingBufferPool;
+
+class SSAA final : public AntiAliasPass {
+public:
+    explicit SSAA(const Device& device, MemoryAllocator& allocator, size_t image_count,
+                  VkExtent2D extent);
+    ~SSAA() override;
+
+    void Draw(Scheduler& scheduler, size_t image_index, VkImage* inout_image,
+              VkImageView* inout_image_view) override;
+
+private:
+    void CreateImages();
+    void CreateRenderPasses();
+    void CreateSampler();
+    void CreateShaders();
+    void CreateDescriptorPool();
+    void CreateDescriptorSetLayouts();
+    void CreateDescriptorSets();
+    void CreatePipelineLayouts();
+    void CreatePipelines();
+    void UpdateDescriptorSets(VkImageView image_view, size_t image_index);
+    void UploadImages(Scheduler& scheduler);
+
+    const Device& m_device;
+    MemoryAllocator& m_allocator;
+    const VkExtent2D m_extent;
+    const u32 m_image_count;
+
+    vk::ShaderModule m_vertex_shader{};
+    vk::ShaderModule m_fragment_shader{};
+    vk::DescriptorPool m_descriptor_pool{};
+    vk::DescriptorSetLayout m_descriptor_set_layout{};
+    vk::PipelineLayout m_pipeline_layout{};
+    vk::Pipeline m_pipeline{};
+    vk::RenderPass m_renderpass{};
+
+    struct Image {
+        vk::DescriptorSets descriptor_sets{};
+        vk::Framebuffer framebuffer{};
+        vk::Image image{};
+        vk::ImageView image_view{};
+    };
+    std::vector<Image> m_dynamic_images{};
+    bool m_images_ready{};
+
+    vk::Sampler m_sampler{};
+};
+
+} // namespace Vulkan

src/video_core/renderer_vulkan/vk_present_manager.cpp

@@ -338,7 +338,7 @@ void PresentManager::PresentThread(std::stop_token token) {
             // By exchanging the lock ownership we take the swapchain lock
             // before the queue lock goes out of scope. This way the swapchain
             // lock in WaitPresent is guaranteed to occur after here.
-            std::exchange(lock, std::unique_lock{swapchain_mutex});
+            void(std::exchange(lock, std::unique_lock{swapchain_mutex}));
             CopyToSwapchain(frame);
 
             // Free the frame for reuse

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -300,7 +300,7 @@ void Scheduler::WorkerThread(std::stop_token stop_token) {
             // Exchange lock ownership so that we take the execution lock before
             // the queue lock goes out of scope. This allows us to force execution
             // to complete in the next step.
-            std::exchange(lk, std::unique_lock{execution_mutex});
+            void(std::exchange(lk, std::unique_lock{execution_mutex}));
 
             // Perform the work, tracking whether the chunk was a submission
             // before executing.

src/video_core/vulkan_common/vulkan_memory_allocator.cpp

@@ -26,350 +26,329 @@
 #include "common/settings.h"
 
 namespace Vulkan {
-    namespace {
+namespace {
 
 // Helpers translating MemoryUsage to flags/usage
 
-        [[maybe_unused]] VkMemoryPropertyFlags MemoryUsagePropertyFlags(MemoryUsage usage) {
-            switch (usage) {
-                case MemoryUsage::DeviceLocal:
-                    return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
-                case MemoryUsage::Upload:
-                    return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                           VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-                case MemoryUsage::Download:
-                    return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                           VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
-                           VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
-                case MemoryUsage::Stream:
-                    return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
-                           VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                           VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-            }
-            ASSERT_MSG(false, "Invalid memory usage={}", usage);
-            return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+    [[maybe_unused]] VkMemoryPropertyFlags MemoryUsagePropertyFlags(MemoryUsage usage) {
+        switch (usage) {
+            case MemoryUsage::DeviceLocal:
+                return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+            case MemoryUsage::Upload:
+                return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+            case MemoryUsage::Download:
+                return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
+                        VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+            case MemoryUsage::Stream:
+                return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
+                        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
         }
+        ASSERT_MSG(false, "Invalid memory usage={}", usage);
+        return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+    }
 
-        [[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferredVmaFlags(MemoryUsage usage) {
-            if (usage == MemoryUsage::Download) {
-                return VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-            }
-            return usage != MemoryUsage::DeviceLocal ? VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
-                                                     : VkMemoryPropertyFlagBits{};
+    [[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferredVmaFlags(MemoryUsage usage) {
+        if (usage == MemoryUsage::Download) {
+            return VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
         }
+        return usage != MemoryUsage::DeviceLocal ? VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
+                                                    : VkMemoryPropertyFlagBits{};
+    }
 
-        [[nodiscard]] VmaAllocationCreateFlags MemoryUsageVmaFlags(MemoryUsage usage) {
-            switch (usage) {
-                case MemoryUsage::Upload:
-                case MemoryUsage::Stream:
-                    return VMA_ALLOCATION_CREATE_MAPPED_BIT |
-                           VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;
-                case MemoryUsage::Download:
-                    return VMA_ALLOCATION_CREATE_MAPPED_BIT |
-                           VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;
-                case MemoryUsage::DeviceLocal:
-                    return {};
-            }
-            return {};
+    [[nodiscard]] VmaAllocationCreateFlags MemoryUsageVmaFlags(MemoryUsage usage) {
+        switch (usage) {
+            case MemoryUsage::Upload:
+            case MemoryUsage::Stream:
+                return VMA_ALLOCATION_CREATE_MAPPED_BIT |
+                        VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;
+            case MemoryUsage::Download:
+                return VMA_ALLOCATION_CREATE_MAPPED_BIT |
+                        VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;
+            case MemoryUsage::DeviceLocal:
+                return {};
         }
+        return {};
+    }
 
-        [[nodiscard]] VmaMemoryUsage MemoryUsageVma(MemoryUsage usage) {
-            switch (usage) {
-                case MemoryUsage::DeviceLocal:
-                case MemoryUsage::Stream:
-                    return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
-                case MemoryUsage::Upload:
-                case MemoryUsage::Download:
-                    return VMA_MEMORY_USAGE_AUTO_PREFER_HOST;
-            }
-            return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
+    [[nodiscard]] VmaMemoryUsage MemoryUsageVma(MemoryUsage usage) {
+        switch (usage) {
+            case MemoryUsage::DeviceLocal:
+            case MemoryUsage::Stream:
+                return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
+            case MemoryUsage::Upload:
+            case MemoryUsage::Download:
+                return VMA_MEMORY_USAGE_AUTO_PREFER_HOST;
         }
-
-
-// This avoids calling vkGetBufferMemoryRequirements* directly.
-        template<typename T>
-        static VkBuffer GetVkHandleFromBuffer(const T &buf) {
-            if constexpr (requires { static_cast<VkBuffer>(buf); }) {
-                return static_cast<VkBuffer>(buf);
-            } else if constexpr (requires {{ buf.GetHandle() } -> std::convertible_to<VkBuffer>; }) {
-                return buf.GetHandle();
-            } else if constexpr (requires {{ buf.Handle() } -> std::convertible_to<VkBuffer>; }) {
-                return buf.Handle();
-            } else if constexpr (requires {{ buf.vk_handle() } -> std::convertible_to<VkBuffer>; }) {
-                return buf.vk_handle();
-            } else {
-                static_assert(sizeof(T) == 0, "Cannot extract VkBuffer handle from vk::Buffer");
-                return VK_NULL_HANDLE;
-            }
-        }
-
-    } // namespace
+        return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
+    }
+} // namespace
 
 //MemoryCommit is now VMA-backed
-    MemoryCommit::MemoryCommit(VmaAllocator alloc, VmaAllocation a,
-                               const VmaAllocationInfo &info) noexcept
-            : allocator{alloc}, allocation{a}, memory{info.deviceMemory},
-              offset{info.offset}, size{info.size}, mapped_ptr{info.pMappedData} {
-        // Log GPU memory allocation
+MemoryCommit::MemoryCommit(VmaAllocator alloc, VmaAllocation a,
+                            const VmaAllocationInfo &info) noexcept
+        : allocator{alloc}, allocation{a}, memory{info.deviceMemory},
+            offset{info.offset}, size{info.size}, mapped_ptr{info.pMappedData} {
+    // Log GPU memory allocation
+    if (GPU::Logging::IsActive() &&
+        Settings::values.gpu_log_memory_tracking.GetValue()) {
+        GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
+            reinterpret_cast<uintptr_t>(memory),
+            static_cast<u64>(size),
+            0  // Memory property flags (not easily available from VMA)
+        );
+    }
+}
+
+MemoryCommit::~MemoryCommit() { Release(); }
+
+MemoryCommit::MemoryCommit(MemoryCommit &&rhs) noexcept
+        : allocator{std::exchange(rhs.allocator, nullptr)},
+            allocation{std::exchange(rhs.allocation, nullptr)},
+            memory{std::exchange(rhs.memory, VK_NULL_HANDLE)},
+            offset{std::exchange(rhs.offset, 0)},
+            size{std::exchange(rhs.size, 0)},
+            mapped_ptr{std::exchange(rhs.mapped_ptr, nullptr)} {}
+
+MemoryCommit &MemoryCommit::operator=(MemoryCommit &&rhs) noexcept {
+    if (this != &rhs) {
+        Release();
+        allocator = std::exchange(rhs.allocator, nullptr);
+        allocation = std::exchange(rhs.allocation, nullptr);
+        memory = std::exchange(rhs.memory, VK_NULL_HANDLE);
+        offset = std::exchange(rhs.offset, 0);
+        size = std::exchange(rhs.size, 0);
+        mapped_ptr = std::exchange(rhs.mapped_ptr, nullptr);
+    }
+    return *this;
+}
+
+std::span<u8> MemoryCommit::Map()
+{
+    if (!allocation) return {};
+    if (!mapped_ptr) {
+        if (vmaMapMemory(allocator, allocation, &mapped_ptr) != VK_SUCCESS) return {};
+    }
+    const size_t n = static_cast<size_t>(std::min<VkDeviceSize>(size,
+                                                                (std::numeric_limits<size_t>::max)()));
+    return std::span<u8>{static_cast<u8 *>(mapped_ptr), n};
+}
+
+std::span<const u8> MemoryCommit::Map() const
+{
+    if (!allocation) return {};
+    if (!mapped_ptr) {
+        void *p = nullptr;
+        if (vmaMapMemory(allocator, allocation, &p) != VK_SUCCESS) return {};
+        const_cast<MemoryCommit *>(this)->mapped_ptr = p;
+    }
+    const size_t n = static_cast<size_t>(std::min<VkDeviceSize>(size,
+                                                                (std::numeric_limits<size_t>::max)()));
+    return std::span<const u8>{static_cast<const u8 *>(mapped_ptr), n};
+}
+
+void MemoryCommit::Unmap()
+{
+    if (allocation && mapped_ptr) {
+        vmaUnmapMemory(allocator, allocation);
+        mapped_ptr = nullptr;
+    }
+}
+
+void MemoryCommit::Release() {
+    if (allocation && allocator) {
+        // Log GPU memory deallocation
         if (GPU::Logging::IsActive() &&
-            Settings::values.gpu_log_memory_tracking.GetValue()) {
-            GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
-                reinterpret_cast<uintptr_t>(memory),
-                static_cast<u64>(size),
-                0  // Memory property flags (not easily available from VMA)
+            Settings::values.gpu_log_memory_tracking.GetValue() &&
+            memory != VK_NULL_HANDLE) {
+            GPU::Logging::GPULogger::GetInstance().LogMemoryDeallocation(
+                reinterpret_cast<uintptr_t>(memory)
             );
         }
-    }
 
-    MemoryCommit::~MemoryCommit() { Release(); }
-
-    MemoryCommit::MemoryCommit(MemoryCommit &&rhs) noexcept
-            : allocator{std::exchange(rhs.allocator, nullptr)},
-              allocation{std::exchange(rhs.allocation, nullptr)},
-              memory{std::exchange(rhs.memory, VK_NULL_HANDLE)},
-              offset{std::exchange(rhs.offset, 0)},
-              size{std::exchange(rhs.size, 0)},
-              mapped_ptr{std::exchange(rhs.mapped_ptr, nullptr)} {}
-
-    MemoryCommit &MemoryCommit::operator=(MemoryCommit &&rhs) noexcept {
-        if (this != &rhs) {
-            Release();
-            allocator = std::exchange(rhs.allocator, nullptr);
-            allocation = std::exchange(rhs.allocation, nullptr);
-            memory = std::exchange(rhs.memory, VK_NULL_HANDLE);
-            offset = std::exchange(rhs.offset, 0);
-            size = std::exchange(rhs.size, 0);
-            mapped_ptr = std::exchange(rhs.mapped_ptr, nullptr);
-        }
-        return *this;
-    }
-
-    std::span<u8> MemoryCommit::Map()
-    {
-        if (!allocation) return {};
-        if (!mapped_ptr) {
-            if (vmaMapMemory(allocator, allocation, &mapped_ptr) != VK_SUCCESS) return {};
-        }
-        const size_t n = static_cast<size_t>(std::min<VkDeviceSize>(size,
-                                                                    (std::numeric_limits<size_t>::max)()));
-        return std::span<u8>{static_cast<u8 *>(mapped_ptr), n};
-    }
-
-    std::span<const u8> MemoryCommit::Map() const
-    {
-        if (!allocation) return {};
-        if (!mapped_ptr) {
-            void *p = nullptr;
-            if (vmaMapMemory(allocator, allocation, &p) != VK_SUCCESS) return {};
-            const_cast<MemoryCommit *>(this)->mapped_ptr = p;
-        }
-        const size_t n = static_cast<size_t>(std::min<VkDeviceSize>(size,
-                                                                    (std::numeric_limits<size_t>::max)()));
-        return std::span<const u8>{static_cast<const u8 *>(mapped_ptr), n};
-    }
-
-    void MemoryCommit::Unmap()
-    {
-        if (allocation && mapped_ptr) {
+        if (mapped_ptr) {
             vmaUnmapMemory(allocator, allocation);
             mapped_ptr = nullptr;
         }
+        vmaFreeMemory(allocator, allocation);
     }
+    allocation = nullptr;
+    allocator = nullptr;
+    memory = VK_NULL_HANDLE;
+    offset = 0;
+    size = 0;
+}
 
-    void MemoryCommit::Release() {
-        if (allocation && allocator) {
-            // Log GPU memory deallocation
-            if (GPU::Logging::IsActive() &&
-                Settings::values.gpu_log_memory_tracking.GetValue() &&
-                memory != VK_NULL_HANDLE) {
-                GPU::Logging::GPULogger::GetInstance().LogMemoryDeallocation(
-                    reinterpret_cast<uintptr_t>(memory)
-                );
-            }
+MemoryAllocator::MemoryAllocator(const Device &device_)
+        : device{device_}, allocator{device.GetAllocator()},
+            properties{device_.GetPhysical().GetMemoryProperties().memoryProperties},
+            buffer_image_granularity{
+                    device_.GetPhysical().GetProperties().limits.bufferImageGranularity} {
 
-            if (mapped_ptr) {
-                vmaUnmapMemory(allocator, allocation);
-                mapped_ptr = nullptr;
-            }
-            vmaFreeMemory(allocator, allocation);
-        }
-        allocation = nullptr;
-        allocator = nullptr;
-        memory = VK_NULL_HANDLE;
-        offset = 0;
-        size = 0;
-    }
-
-    MemoryAllocator::MemoryAllocator(const Device &device_)
-            : device{device_}, allocator{device.GetAllocator()},
-              properties{device_.GetPhysical().GetMemoryProperties().memoryProperties},
-              buffer_image_granularity{
-                      device_.GetPhysical().GetProperties().limits.bufferImageGranularity} {
-
-        // Preserve the previous "RenderDoc small heap" trimming behavior that we had in original vma minus the heap bug
-        if (device.HasDebuggingToolAttached())
-        {
-            using namespace Common::Literals;
-            ForEachDeviceLocalHostVisibleHeap(device, [this](size_t heap_idx, VkMemoryHeap &heap) {
-                if (heap.size <= 256_MiB) {
-                    for (u32 t = 0; t < properties.memoryTypeCount; ++t) {
-                        if (properties.memoryTypes[t].heapIndex == heap_idx) {
-                            valid_memory_types &= ~(1u << t);
-                        }
+    // Preserve the previous "RenderDoc small heap" trimming behavior that we had in original vma minus the heap bug
+    if (device.HasDebuggingToolAttached())
+    {
+        using namespace Common::Literals;
+        ForEachDeviceLocalHostVisibleHeap(device, [this](size_t heap_idx, VkMemoryHeap &heap) {
+            if (heap.size <= 256_MiB) {
+                for (u32 t = 0; t < properties.memoryTypeCount; ++t) {
+                    if (properties.memoryTypes[t].heapIndex == heap_idx) {
+                        valid_memory_types &= ~(1u << t);
                     }
                 }
-            });
-        }
+            }
+        });
     }
+}
 
-    MemoryAllocator::~MemoryAllocator() = default;
+MemoryAllocator::~MemoryAllocator() = default;
 
-    vk::Image MemoryAllocator::CreateImage(const VkImageCreateInfo &ci) const
-    {
-        const VmaAllocationCreateInfo alloc_ci = {
-                .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT,
-                .usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE,
-                .requiredFlags = 0,
-                .preferredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-                .memoryTypeBits = 0,
-                .pool = VK_NULL_HANDLE,
-                .pUserData = nullptr,
-                .priority = 0.f,
-        };
-
-        VkImage handle{};
-        VmaAllocation allocation{};
-        VmaAllocationInfo alloc_info{};
-        vk::Check(vmaCreateImage(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
-
-        // Log GPU memory allocation for images
-        if (GPU::Logging::IsActive() &&
-            Settings::values.gpu_log_memory_tracking.GetValue()) {
-            GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
-                reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),
-                static_cast<u64>(alloc_info.size),
-                VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT
-            );
-        }
-
-        return vk::Image(handle, ci.usage, *device.GetLogical(), allocator, allocation,
-                         device.GetDispatchLoader());
-    }
-
-    vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage) const {
-        // MESA will do memcpy() if not marked as host cached, so just force mark it for most buffers
-        auto const anv_flags = (usage == MemoryUsage::Stream
-            && device.GetDriverID() == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA)
-            ? VK_MEMORY_PROPERTY_HOST_CACHED_BIT : 0;
-        const VmaAllocationCreateInfo alloc_ci = {
-            .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage),
-            .usage = MemoryUsageVma(usage),
+vk::Image MemoryAllocator::CreateImage(const VkImageCreateInfo &ci) const
+{
+    const VmaAllocationCreateInfo alloc_ci = {
+            .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT,
+            .usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE,
             .requiredFlags = 0,
-            .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
-            .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
+            .preferredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
+            .memoryTypeBits = 0,
             .pool = VK_NULL_HANDLE,
             .pUserData = nullptr,
             .priority = 0.f,
-        };
+    };
 
-        VkBuffer handle{};
-        VmaAllocationInfo alloc_info{};
-        VmaAllocation allocation{};
-        VkMemoryPropertyFlags property_flags{};
+    VkImage handle{};
+    VmaAllocation allocation{};
+    VmaAllocationInfo alloc_info{};
+    vk::Check(vmaCreateImage(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
 
-        vk::Check(vmaCreateBuffer(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
-        vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);
-
-        // Log GPU memory allocation for buffers
-        if (GPU::Logging::IsActive() &&
-            Settings::values.gpu_log_memory_tracking.GetValue()) {
-            GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
-                reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),
-                static_cast<u64>(alloc_info.size),
-                property_flags
-            );
-        }
-
-        u8 *data = reinterpret_cast<u8 *>(alloc_info.pMappedData);
-        const std::span<u8> mapped_data = data ? std::span<u8>{data, ci.size} : std::span<u8>{};
-        const bool is_coherent = (property_flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0;
-
-        return vk::Buffer(handle, *device.GetLogical(), allocator, allocation, mapped_data,
-                          is_coherent,
-                          device.GetDispatchLoader());
+    // Log GPU memory allocation for images
+    if (GPU::Logging::IsActive() &&
+        Settings::values.gpu_log_memory_tracking.GetValue()) {
+        GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
+            reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),
+            static_cast<u64>(alloc_info.size),
+            VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT
+        );
     }
 
-    MemoryCommit MemoryAllocator::Commit(const VkMemoryRequirements &reqs, MemoryUsage usage)
-    {
-        const auto vma_usage = MemoryUsageVma(usage);
-        VmaAllocationCreateInfo ci{};
-        ci.flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage);
-        ci.usage = vma_usage;
-        ci.memoryTypeBits = reqs.memoryTypeBits & valid_memory_types;
-        ci.requiredFlags = 0;
-        ci.preferredFlags = MemoryUsagePreferredVmaFlags(usage);
+    return vk::Image(handle, ci.usage, *device.GetLogical(), allocator, allocation,
+                        device.GetDispatchLoader());
+}
 
-        VmaAllocation a{};
-        VmaAllocationInfo info{};
+vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage) const {
+    // MESA will do memcpy() if not marked as host cached, so just force mark it for most buffers
+    auto const anv_flags = (usage == MemoryUsage::Stream
+        && device.GetDriverID() == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA)
+        ? VK_MEMORY_PROPERTY_HOST_CACHED_BIT : 0;
+    const VmaAllocationCreateInfo alloc_ci = {
+        .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage),
+        .usage = MemoryUsageVma(usage),
+        .requiredFlags = 0,
+        .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
+        .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
+        .pool = VK_NULL_HANDLE,
+        .pUserData = nullptr,
+        .priority = 0.f,
+    };
 
-        VkResult res = vmaAllocateMemory(allocator, &reqs, &ci, &a, &info);
+    VkBuffer handle{};
+    VmaAllocationInfo alloc_info{};
+    VmaAllocation allocation{};
+    VkMemoryPropertyFlags property_flags{};
 
-        if (res != VK_SUCCESS) {
-            // Relax 1: drop budget constraint
-            auto ci2 = ci;
-            ci2.flags &= ~VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT;
-            res = vmaAllocateMemory(allocator, &reqs, &ci2, &a, &info);
+    vk::Check(vmaCreateBuffer(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
+    vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);
 
-            // Relax 2: if we preferred DEVICE_LOCAL, drop that preference
-            if (res != VK_SUCCESS && (ci.preferredFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
-                auto ci3 = ci2;
-                ci3.preferredFlags &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
-                res = vmaAllocateMemory(allocator, &reqs, &ci3, &a, &info);
-            }
-        }
-
-        vk::Check(res);
-        return MemoryCommit(allocator, a, info);
+    // Log GPU memory allocation for buffers
+    if (GPU::Logging::IsActive() &&
+        Settings::values.gpu_log_memory_tracking.GetValue()) {
+        GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
+            reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),
+            static_cast<u64>(alloc_info.size),
+            property_flags
+        );
     }
 
-    MemoryCommit MemoryAllocator::Commit(const vk::Buffer &buffer, MemoryUsage usage) {
-        // Allocate memory appropriate for this buffer automatically
-        const auto vma_usage = MemoryUsageVma(usage);
+    u8 *data = reinterpret_cast<u8 *>(alloc_info.pMappedData);
+    const std::span<u8> mapped_data = data ? std::span<u8>{data, ci.size} : std::span<u8>{};
+    const bool is_coherent = (property_flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0;
 
-        VmaAllocationCreateInfo ci{};
-        ci.flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage);
-        ci.usage = vma_usage;
-        ci.requiredFlags = 0;
-        ci.preferredFlags = MemoryUsagePreferredVmaFlags(usage);
-        ci.pool = VK_NULL_HANDLE;
-        ci.pUserData = nullptr;
-        ci.priority = 0.0f;
+    return vk::Buffer(handle, *device.GetLogical(), allocator, allocation, mapped_data,
+                        is_coherent,
+                        device.GetDispatchLoader());
+}
 
-        const VkBuffer raw = *buffer;
+MemoryCommit MemoryAllocator::Commit(const VkMemoryRequirements &reqs, MemoryUsage usage)
+{
+    const auto vma_usage = MemoryUsageVma(usage);
+    VmaAllocationCreateInfo ci{};
+    ci.flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage);
+    ci.usage = vma_usage;
+    ci.memoryTypeBits = reqs.memoryTypeBits & valid_memory_types;
+    ci.requiredFlags = 0;
+    ci.preferredFlags = MemoryUsagePreferredVmaFlags(usage);
 
-        VmaAllocation a{};
-        VmaAllocationInfo info{};
+    VmaAllocation a{};
+    VmaAllocationInfo info{};
 
-        // Let VMA infer memory requirements from the buffer
-        VkResult res = vmaAllocateMemoryForBuffer(allocator, raw, &ci, &a, &info);
+    VkResult res = vmaAllocateMemory(allocator, &reqs, &ci, &a, &info);
 
-        if (res != VK_SUCCESS) {
-            auto ci2 = ci;
-            ci2.flags &= ~VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT;
-            res = vmaAllocateMemoryForBuffer(allocator, raw, &ci2, &a, &info);
+    if (res != VK_SUCCESS) {
+        // Relax 1: drop budget constraint
+        auto ci2 = ci;
+        ci2.flags &= ~VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT;
+        res = vmaAllocateMemory(allocator, &reqs, &ci2, &a, &info);
 
-            if (res != VK_SUCCESS && (ci.preferredFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
-                auto ci3 = ci2;
-                ci3.preferredFlags &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
-                res = vmaAllocateMemoryForBuffer(allocator, raw, &ci3, &a, &info);
-            }
+        // Relax 2: if we preferred DEVICE_LOCAL, drop that preference
+        if (res != VK_SUCCESS && (ci.preferredFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
+            auto ci3 = ci2;
+            ci3.preferredFlags &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+            res = vmaAllocateMemory(allocator, &reqs, &ci3, &a, &info);
         }
-
-        vk::Check(res);
-        vk::Check(vmaBindBufferMemory2(allocator, a, 0, raw, nullptr));
-        return MemoryCommit(allocator, a, info);
     }
 
+    vk::Check(res);
+    return MemoryCommit(allocator, a, info);
+}
 
+MemoryCommit MemoryAllocator::Commit(const vk::Buffer &buffer, MemoryUsage usage) {
+    // Allocate memory appropriate for this buffer automatically
+    const auto vma_usage = MemoryUsageVma(usage);
+
+    VmaAllocationCreateInfo ci{};
+    ci.flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage);
+    ci.usage = vma_usage;
+    ci.requiredFlags = 0;
+    ci.preferredFlags = MemoryUsagePreferredVmaFlags(usage);
+    ci.pool = VK_NULL_HANDLE;
+    ci.pUserData = nullptr;
+    ci.priority = 0.0f;
+
+    const VkBuffer raw = *buffer;
+
+    VmaAllocation a{};
+    VmaAllocationInfo info{};
+
+    // Let VMA infer memory requirements from the buffer
+    VkResult res = vmaAllocateMemoryForBuffer(allocator, raw, &ci, &a, &info);
+
+    if (res != VK_SUCCESS) {
+        auto ci2 = ci;
+        ci2.flags &= ~VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT;
+        res = vmaAllocateMemoryForBuffer(allocator, raw, &ci2, &a, &info);
+
+        if (res != VK_SUCCESS && (ci.preferredFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
+            auto ci3 = ci2;
+            ci3.preferredFlags &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+            res = vmaAllocateMemoryForBuffer(allocator, raw, &ci3, &a, &info);
+        }
+    }
+
+    vk::Check(res);
+    vk::Check(vmaBindBufferMemory2(allocator, a, 0, raw, nullptr));
+    return MemoryCommit(allocator, a, info);
+}
 
 } // namespace Vulkan

src/yuzu/main_window.cpp

@@ -4796,6 +4796,6 @@ void VolumeButton::ResetMultiplier() {
 #endif
 
 #if !defined(QT_STATICPLUGIN) || defined(__APPLE__)
-#define VMA_IMPLEMENTATION
+#define VMA_IMPLEMENTATION 1
 #include "video_core/vulkan_common/vma.h"
 #endif

tools/cpm/cmake/package/version.cmake

@@ -65,7 +65,7 @@ else()
 endif()
 
 # update cached cpmfile content
-string(JSON cpmfile SET "${cpmfile}" "${key}" "${new_object}")
+string(JSON cpmfile SET "${cpmfile}" "${KEY}" "${new_object}")
 
 # write cached cpmfile
 get_cpmfile_path(file)