Trigger Build

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>

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

@@ -1,112 +0,0 @@
-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,7 +3,6 @@
 
 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")
@@ -513,7 +512,7 @@ endfunction()
 # =============================================
 
 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers Foundation)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security UniformTypeIdentifiers)
         find_library(${fw}_LIBRARY ${fw} REQUIRED)
         list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
     endforeach()

cpmfile.json

@@ -311,9 +311,6 @@
         "find_args": "CONFIG",
         "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
         "package": "VulkanMemoryAllocator",
-        "patches": [
-            "0001-macos-clang.patch"
-        ],
         "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
         "version": "v3.3.0"
     },

externals/tz/tz/tz.h

@@ -11,7 +11,6 @@
 #include <limits>
 #include <span>
 #include <array>
-#include <algorithm>
 #include <time.h>
 
 namespace Tz {

src/common/demangle.cpp

@@ -5,7 +5,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <string>
-#include <cstdlib>
 #include <string_view>
 #ifdef _WIN32
 #include <llvm/Demangle/Demangle.h>

src/common/fs/file.cpp

@@ -7,18 +7,25 @@
 #include <vector>
 
 #include "common/assert.h"
+#include "common/bit_util.h"
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
+#include "common/fs/fs_types.h"
 #ifdef __ANDROID__
 #include "common/fs/fs_android.h"
 #endif
 #include "common/logging.h"
+#include "common/literals.h"
 
 #ifdef _WIN32
 #include <io.h>
 #include <share.h>
+#include <windows.h>
 #else
 #include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #endif
 
 #ifdef _MSC_VER
@@ -36,13 +43,13 @@ namespace {
 #ifdef _WIN32
 
 /**
- * Converts the file access mode and file type enums to a file access mode wide string.
- *
- * @param mode File access mode
- * @param type File type
- *
- * @returns A pointer to a wide string representing the file access mode.
- */
+* Converts the file access mode and file type enums to a file access mode wide string.
+*
+* @param mode File access mode
+* @param type File type
+*
+* @returns A pointer to a wide string representing the file access mode.
+*/
 [[nodiscard]] constexpr const wchar_t* AccessModeToWStr(FileAccessMode mode, FileType type) {
     switch (type) {
     case FileType::BinaryFile:
@@ -79,12 +86,12 @@ namespace {
 }
 
 /**
- * Converts the file-share access flag enum to a Windows defined file-share access flag.
- *
- * @param flag File-share access flag
- *
- * @returns Windows defined file-share access flag.
- */
+* Converts the file-share access flag enum to a Windows defined file-share access flag.
+*
+* @param flag File-share access flag
+*
+* @returns Windows defined file-share access flag.
+*/
 [[nodiscard]] constexpr int ToWindowsFileShareFlag(FileShareFlag flag) {
     switch (flag) {
     case FileShareFlag::ShareNone:
@@ -102,13 +109,13 @@ namespace {
 #else
 
 /**
- * Converts the file access mode and file type enums to a file access mode string.
- *
- * @param mode File access mode
- * @param type File type
- *
- * @returns A pointer to a string representing the file access mode.
- */
+* Converts the file access mode and file type enums to a file access mode string.
+*
+* @param mode File access mode
+* @param type File type
+*
+* @returns A pointer to a string representing the file access mode.
+*/
 [[nodiscard]] constexpr const char* AccessModeToStr(FileAccessMode mode, FileType type) {
     switch (type) {
     case FileType::BinaryFile:
@@ -147,12 +154,12 @@ namespace {
 #endif
 
 /**
- * Converts the seek origin enum to a seek origin integer.
- *
- * @param origin Seek origin
- *
- * @returns Seek origin integer.
- */
+* Converts the seek origin enum to a seek origin integer.
+*
+* @param origin Seek origin
+*
+* @returns Seek origin integer.
+*/
 [[nodiscard]] constexpr int ToSeekOrigin(SeekOrigin origin) {
     switch (origin) {
     case SeekOrigin::SetOrigin:
@@ -178,7 +185,7 @@ std::string ReadStringFromFile(const std::filesystem::path& path, FileType type)
 }
 
 size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
-                         std::string_view string) {
+                        std::string_view string) {
     if (Exists(path) && !IsFile(path)) {
         return 0;
     }
@@ -189,7 +196,7 @@ size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
 }
 
 size_t AppendStringToFile(const std::filesystem::path& path, FileType type,
-                          std::string_view string) {
+                        std::string_view string) {
     if (Exists(path) && !IsFile(path)) {
         return 0;
     }
@@ -244,69 +251,189 @@ FileType IOFile::GetType() const {
     return file_type;
 }
 
+#if defined(__unix__)
+static int PlatformMapReadOnly(IOFile& io, const char* path) {
+    io.mmap_fd = open(path, O_RDONLY);
+    if (io.mmap_fd > 0) {
+        struct stat st;
+        fstat(io.mmap_fd, &st);
+        io.mmap_size = st.st_size;
+
+        int map_flags = MAP_PRIVATE;
+#ifdef MAP_PREFAULT_READ
+        // Prefaults reads so the final resulting pagetable from this big stupid mmap()
+        // isn't comically lazily loaded, we just coalesce everything in-place for our
+        // lovely mmap flags; if we didn't prefault the reads the page table will be
+        // constructed in-place (i.e on a read-by-read basis) causing lovely soft-faults
+        // which would nuke any performance gains.
+        //
+        // This of course incurs a cost in the initial mmap(2) call, but that is fine.
+        map_flags |= MAP_PREFAULT_READ;
+#endif
+#ifdef MAP_NOSYNC
+        // This causes physical media to not be synched to our file/memory
+        // This means that if the read-only file is written to, we won't see changes
+        // or we may see changes which are just funnily scattered, in any case
+        // this presumes the files won't be changed during execution
+        //
+        // Do not ever use this on write files (if we ever support that); this will create
+        // a fun amount of fragmentation on the disk.
+        map_flags |= MAP_NOSYNC;
+#endif
+#if defined(NDEBUG) && defined(MAP_NOCORE)
+        map_flags |= MAP_NOCORE;
+#endif
+#ifdef MAP_HUGE_2MB
+        map_flags |= MAP_HUGE_2MB; //2mb pages
+#elif defined(MAP_ALIGNED)
+        // File must be big enough that it's worth to super align. We can't just super-align every
+        // file otherwise we will run out of alignments for actually important files :)
+        // System doesn't guarantee a super alignment, but if it's available it will delete
+        // about 3 layers(?) of the TLB tree for each read/write.
+        // Again the cost of faults may make this negligible gains, but hey, we gotta work
+        // what we gotta work with.
+        map_flags |= MAP_ALIGNED(21); //2^21 = 2mb use 2MB pages
+#endif
+        io.mmap_base = (u8*)mmap(nullptr, io.mmap_size, PROT_READ, map_flags, io.mmap_fd, 0);
+        if (io.mmap_base == MAP_FAILED) {
+            close(io.mmap_fd);
+            io.mmap_fd = -1;
+        } else {
+            using namespace Common::Literals;
+            // For small files it is acceptable to use a full readahead
+            // See https://github.com/torvalds/linux/blob/e80d033851b3bc94c3d254ac66660ddd0a49d72c/include/linux/pagemap.h#L1392
+            if (u64(st.st_size) >= 256_MiB) {
+                posix_madvise(io.mmap_base, io.mmap_size, POSIX_MADV_RANDOM);
+            } else {
+                posix_madvise(io.mmap_base, io.mmap_size, POSIX_MADV_SEQUENTIAL);
+            }
+        }
+    }
+    return io.mmap_fd;
+}
+static void PlatformUnmap(IOFile& io) {
+    if (io.mmap_fd != -1) {
+        munmap(io.mmap_base, io.mmap_size);
+        close(io.mmap_fd);
+        io.mmap_fd = -1;
+    }
+}
+#elif defined(__APPLE__)
+// NO IMPLEMENTATION YET
+#else
+static int PlatformMapReadOnly(IOFile& io, const wchar_t* path) {
+    io.file_handle = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
+    if (HANDLE(io.file_handle) != INVALID_HANDLE_VALUE) {
+        io.mapping_handle = CreateFileMappingW(HANDLE(io.file_handle), nullptr, PAGE_READONLY, 0, 0, nullptr);
+        if (io.mapping_handle) {
+            io.mmap_base = (u8*)MapViewOfFile(HANDLE(io.mapping_handle), FILE_MAP_READ, 0, 0, 0);
+            if (io.mmap_base) {
+                _LARGE_INTEGER pvalue;
+                GetFileSizeEx(io.file_handle, &pvalue);
+                io.mmap_size = uint32_t(pvalue.QuadPart);
+            } else {
+                CloseHandle(io.mapping_handle);
+                CloseHandle(io.file_handle);
+                return -1;
+            }
+        } else {
+            CloseHandle(io.file_handle);
+            return -1;
+        }
+    }
+    return 0;
+}
+static void PlatformUnmap(IOFile& io) {
+    if(io.mapping_handle) {
+        if(io.mmap_base)
+            UnmapViewOfFile(HANDLE(io.mmap_base));
+        CloseHandle(HANDLE(io.mapping_handle));
+    }
+    if(io.file_handle != INVALID_HANDLE_VALUE)
+        CloseHandle(HANDLE(io.file_handle));
+}
+#endif
+
 void IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, FileShareFlag flag) {
     Close();
-
     file_path = path;
     file_access_mode = mode;
     file_type = type;
-
     errno = 0;
-
 #ifdef _WIN32
-    if (flag != FileShareFlag::ShareNone) {
-        file = _wfsopen(path.c_str(), AccessModeToWStr(mode, type), ToWindowsFileShareFlag(flag));
-    } else {
-        _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
+    // TODO: this probably can use better logic but oh well I'm not a windowser
+    file_handle = nullptr;
+    if (type == FileType::BinaryFile && mode == FileAccessMode::Read) {
+        if (PlatformMapReadOnly(*this, path.c_str()) == -1) {
+            LOG_ERROR(Common_Filesystem, "Error mmap'ing file"); //: {}", path.c_str());
+        }
+    }
+    if (file_handle == nullptr) {
+        if (flag != FileShareFlag::ShareNone) {
+            file = _wfsopen(path.c_str(), AccessModeToWStr(mode, type), ToWindowsFileShareFlag(flag));
+        } else {
+            _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
+        }
     }
 #elif __ANDROID__
     if (Android::IsContentUri(path)) {
         ASSERT_MSG(mode == FileAccessMode::Read, "Content URI file access is for read-only!");
-        const auto fd = Android::OpenContentUri(path, Android::OpenMode::Read);
-        if (fd != -1) {
-            file = fdopen(fd, "r");
-            const auto error_num = errno;
-            if (error_num != 0 && file == nullptr) {
-                LOG_ERROR(Common_Filesystem, "Error opening file: {}, error: {}", path.c_str(),
-                          strerror(error_num));
+        if (PlatformMapReadOnly(*this, path.c_str()) == -1) {
+            LOG_ERROR(Common_Filesystem, "Error mmap'ing file: {}", path.c_str());
+            int const fd = Android::OpenContentUri(path, Android::OpenMode::Read);
+            if (fd != -1) {
+                file = fdopen(fd, "r");
+                if (errno != 0 && file == nullptr)
+                    LOG_ERROR(Common_Filesystem, "Error opening file: {}, error: {}", path.c_str(), strerror(errno));
+            } else {
+                LOG_ERROR(Common_Filesystem, "Error opening file: {}", path.c_str());
             }
-        } else {
-            LOG_ERROR(Common_Filesystem, "Error opening file: {}", path.c_str());
         }
     } else {
         file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
     }
+#elif defined(__HAIKU__) || defined(__managarm__) || defined(__OPENORBIS__) || defined(__APPLE__)
+    file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
+#elif defined(__unix__)
+    if (type == FileType::BinaryFile && mode == FileAccessMode::Read) {
+        if (PlatformMapReadOnly(*this, path.c_str()) == -1) {
+            LOG_ERROR(Common_Filesystem, "Error mmap'ing file: {}", path.c_str());
+        }
+    }
+    if (mmap_fd == -1) {
+        file = std::fopen(path.c_str(), AccessModeToStr(mode, type)); // mmap(2) failed or simply we can't use it
+    }
 #else
+    // Some other fancy OS (ahem fucking Darwin/Mac OSX)
     file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
 #endif
-
     if (!IsOpen()) {
         const auto ec = std::error_code{errno, std::generic_category()};
         LOG_ERROR(Common_Filesystem, "Failed to open the file at path={}, ec_message={}",
-                  PathToUTF8String(file_path), ec.message());
+            PathToUTF8String(file_path), ec.message());
     }
 }
 
 void IOFile::Close() {
-    if (!IsOpen()) {
-        return;
+#if defined(__APPLE__)
+    // NO IMPLEMENTATION YET
+#else
+    PlatformUnmap(*this);
+#endif
+    if (file) {
+        errno = 0;
+        const auto close_result = std::fclose(file) == 0;
+        if (!close_result) {
+            const auto ec = std::error_code{errno, std::generic_category()};
+            LOG_ERROR(Common_Filesystem, "Failed to close the file at path={}, ec_message={}",
+                PathToUTF8String(file_path), ec.message());
+        }
+        file = nullptr;
     }
-
-    errno = 0;
-
-    const auto close_result = std::fclose(file) == 0;
-
-    if (!close_result) {
-        const auto ec = std::error_code{errno, std::generic_category()};
-        LOG_ERROR(Common_Filesystem, "Failed to close the file at path={}, ec_message={}",
-                  PathToUTF8String(file_path), ec.message());
-    }
-
-    file = nullptr;
 }
 
 bool IOFile::IsOpen() const {
-    return file != nullptr;
+    return file != nullptr || IsMappedFile();
 }
 
 std::string IOFile::ReadString(size_t length) const {
@@ -323,137 +450,132 @@ size_t IOFile::WriteString(std::span<const char> string) const {
 }
 
 bool IOFile::Flush() const {
-    if (!IsOpen()) {
-        return false;
+    ASSERT(!IsMappedFile());
+    if (file) {
+        errno = 0;
+        auto const flush_result = std::fflush(file) == 0;
+        if (!flush_result) {
+            const auto ec = std::error_code{errno, std::generic_category()};
+            LOG_ERROR(Common_Filesystem, "Failed to flush the file at path={}, ec_message={}",
+                PathToUTF8String(file_path), ec.message());
+        }
+        return flush_result;
     }
-
-    errno = 0;
-
-#ifdef _WIN32
-    const auto flush_result = std::fflush(file) == 0;
-#else
-    const auto flush_result = std::fflush(file) == 0;
-#endif
-
-    if (!flush_result) {
-        const auto ec = std::error_code{errno, std::generic_category()};
-        LOG_ERROR(Common_Filesystem, "Failed to flush the file at path={}, ec_message={}",
-                  PathToUTF8String(file_path), ec.message());
-    }
-
-    return flush_result;
+    return false;
 }
 
 bool IOFile::Commit() const {
-    if (!IsOpen()) {
-        return false;
-    }
-
-    errno = 0;
-
+    ASSERT(!IsMappedFile());
+    if (file) {
+        errno = 0;
 #ifdef _WIN32
-    const auto commit_result = std::fflush(file) == 0 && _commit(fileno(file)) == 0;
+        const auto commit_result = std::fflush(file) == 0 && _commit(fileno(file)) == 0;
 #else
-    const auto commit_result = std::fflush(file) == 0 && fsync(fileno(file)) == 0;
+        const auto commit_result = std::fflush(file) == 0 && fsync(fileno(file)) == 0;
 #endif
-
-    if (!commit_result) {
-        const auto ec = std::error_code{errno, std::generic_category()};
-        LOG_ERROR(Common_Filesystem, "Failed to commit the file at path={}, ec_message={}",
-                  PathToUTF8String(file_path), ec.message());
+        if (!commit_result) {
+            const auto ec = std::error_code{errno, std::generic_category()};
+            LOG_ERROR(Common_Filesystem, "Failed to commit the file at path={}, ec_message={}",
+                PathToUTF8String(file_path), ec.message());
+        }
+        return commit_result;
     }
-
-    return commit_result;
+    return false;
 }
 
 bool IOFile::SetSize(u64 size) const {
-    if (!IsOpen()) {
-        return false;
-    }
-
-    errno = 0;
-
+    ASSERT(!IsMappedFile());
+    if (file) {
+        errno = 0;
 #ifdef _WIN32
-    const auto set_size_result = _chsize_s(fileno(file), static_cast<s64>(size)) == 0;
+        const auto set_size_result = _chsize_s(fileno(file), s64(size)) == 0;
 #else
-    const auto set_size_result = ftruncate(fileno(file), static_cast<s64>(size)) == 0;
+        const auto set_size_result = ftruncate(fileno(file), s64(size)) == 0;
 #endif
-
-    if (!set_size_result) {
-        const auto ec = std::error_code{errno, std::generic_category()};
-        LOG_ERROR(Common_Filesystem, "Failed to resize the file at path={}, size={}, ec_message={}",
-                  PathToUTF8String(file_path), size, ec.message());
+        if (!set_size_result) {
+            const auto ec = std::error_code{errno, std::generic_category()};
+            LOG_ERROR(Common_Filesystem, "Failed to resize the file at path={}, size={}, ec_message={}",
+                PathToUTF8String(file_path), size, ec.message());
+        }
+        return set_size_result;
     }
-
-    return set_size_result;
+    return false;
 }
 
 u64 IOFile::GetSize() const {
-    if (!IsOpen()) {
-        return 0;
-    }
+    if (IsMappedFile())
+        return mmap_size;
+    if (file) {
+        // Flush any unwritten buffered data into the file prior to retrieving the file mmap_size.
+        std::fflush(file);
+#if __ANDROID__
+        u64 file_size = 0;
+        if (Android::IsContentUri(file_path)) {
+            file_size = Android::GetSize(file_path);
+        } else {
+            std::error_code ec;
 
-    // Flush any unwritten buffered data into the file prior to retrieving the file size.
-    std::fflush(file);
+            file_size = fs::file_size(file_path, ec);
 
-#ifdef __ANDROID__
-    u64 file_size = 0;
-    if (Android::IsContentUri(file_path)) {
-        file_size = Android::GetSize(file_path);
-    } else {
+            if (ec) {
+                LOG_ERROR(Common_Filesystem, "Failed to retrieve the file mmap_size of path={}, ec_message={}",
+                    PathToUTF8String(file_path), ec.message());
+                return 0;
+            }
+        }
+#else
         std::error_code ec;
-
-        file_size = fs::file_size(file_path, ec);
-
+        auto const file_size = fs::file_size(file_path, ec);
         if (ec) {
-            LOG_ERROR(Common_Filesystem,
-                      "Failed to retrieve the file size of path={}, ec_message={}",
-                      PathToUTF8String(file_path), ec.message());
+            LOG_ERROR(Common_Filesystem, "Failed to retrieve the file mmap_size of path={}, ec_message={}",
+                PathToUTF8String(file_path), ec.message());
             return 0;
         }
-    }
-#else
-    std::error_code ec;
-
-    const auto file_size = fs::file_size(file_path, ec);
-
-    if (ec) {
-        LOG_ERROR(Common_Filesystem, "Failed to retrieve the file size of path={}, ec_message={}",
-                  PathToUTF8String(file_path), ec.message());
-        return 0;
-    }
 #endif
-
-    return file_size;
+        return file_size;
+    }
+    return 0;
 }
 
 bool IOFile::Seek(s64 offset, SeekOrigin origin) const {
-    if (!IsOpen()) {
-        return false;
+    if (IsMappedFile()) {
+        // fuck you to whoever made this method const
+        switch (origin) {
+        case SeekOrigin::SetOrigin:
+            mmap_offset = s64(offset);
+            break;
+        case SeekOrigin::CurrentPosition:
+            mmap_offset += s64(offset);
+            break;
+        case SeekOrigin::End:
+            mmap_offset = s64(mmap_size) + s64(offset);
+            break;
+        }
+        return true;
     }
-
-    errno = 0;
-
-    const auto seek_result = fseeko(file, offset, ToSeekOrigin(origin)) == 0;
-
-    if (!seek_result) {
-        const auto ec = std::error_code{errno, std::generic_category()};
-        LOG_ERROR(Common_Filesystem,
-                  "Failed to seek the file at path={}, offset={}, origin={}, ec_message={}",
-                  PathToUTF8String(file_path), offset, origin, ec.message());
+    if (file) {
+        errno = 0;
+        const auto seek_result = fseeko(file, offset, ToSeekOrigin(origin)) == 0;
+        if (!seek_result) {
+            const auto ec = std::error_code{errno, std::generic_category()};
+            LOG_ERROR(Common_Filesystem, "Failed to seek the file at path={}, offset={}, origin={}, ec_message={}",
+                PathToUTF8String(file_path), offset, origin, ec.message());
+        }
+        return seek_result;
     }
-
-    return seek_result;
+    return false;
 }
 
 s64 IOFile::Tell() const {
-    if (!IsOpen()) {
-        return 0;
+    if (IsMappedFile()) {
+        errno = 0;
+        return s64(mmap_offset);
     }
-
-    errno = 0;
-
-    return ftello(file);
+    if (file) {
+        errno = 0;
+        return ftello(file);
+    }
+    return 0;
 }
 
 } // namespace Common::FS

src/common/fs/file.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <cstdio>
+#include <cstring>
 #include <filesystem>
 #include <span>
 #include <type_traits>
@@ -24,12 +25,12 @@ enum class SeekOrigin {
 };
 
 /**
- * Opens a file stream at path with the specified open mode.
- *
- * @param file_stream Reference to file stream
- * @param path Filesystem path
- * @param open_mode File stream open mode
- */
+* Opens a file stream at path with the specified open mode.
+*
+* @param file_stream Reference to file stream
+* @param path Filesystem path
+* @param open_mode File stream open mode
+*/
 template <typename FileStream>
 void OpenFileStream(FileStream& file_stream, const std::filesystem::path& path,
                     std::ios_base::openmode open_mode) {
@@ -48,14 +49,14 @@ void OpenFileStream(FileStream& file_stream, const Path& path, std::ios_base::op
 #endif
 
 /**
- * Reads an entire file at path and returns a string of the contents read from the file.
- * If the filesystem object at path is not a regular file, this function returns an empty string.
- *
- * @param path Filesystem path
- * @param type File type
- *
- * @returns A string of the contents read from the file.
- */
+* Reads an entire file at path and returns a string of the contents read from the file.
+* If the filesystem object at path is not a regular file, this function returns an empty string.
+*
+* @param path Filesystem path
+* @param type File type
+*
+* @returns A string of the contents read from the file.
+*/
 [[nodiscard]] std::string ReadStringFromFile(const std::filesystem::path& path, FileType type);
 
 #ifdef _WIN32
@@ -70,18 +71,18 @@ template <typename Path>
 #endif
 
 /**
- * Writes a string to a file at path and returns the number of characters successfully written.
- * If a file already exists at path, its contents will be erased.
- * If a file does not exist at path, it creates and opens a new empty file for writing.
- * If the filesystem object at path exists and is not a regular file, this function returns 0.
- *
- * @param path Filesystem path
- * @param type File type
- *
- * @returns Number of characters successfully written.
- */
+* Writes a string to a file at path and returns the number of characters successfully written.
+* If a file already exists at path, its contents will be erased.
+* If a file does not exist at path, it creates and opens a new empty file for writing.
+* If the filesystem object at path exists and is not a regular file, this function returns 0.
+*
+* @param path Filesystem path
+* @param type File type
+*
+* @returns Number of characters successfully written.
+*/
 [[nodiscard]] size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
-                                       std::string_view string);
+                                    std::string_view string);
 
 #ifdef _WIN32
 template <typename Path>
@@ -95,15 +96,15 @@ template <typename Path>
 #endif
 
 /**
- * Appends a string to a file at path and returns the number of characters successfully written.
- * If a file does not exist at path, it creates and opens a new empty file for appending.
- * If the filesystem object at path exists and is not a regular file, this function returns 0.
- *
- * @param path Filesystem path
- * @param type File type
- *
- * @returns Number of characters successfully written.
- */
+* Appends a string to a file at path and returns the number of characters successfully written.
+* If a file does not exist at path, it creates and opens a new empty file for appending.
+* If the filesystem object at path exists and is not a regular file, this function returns 0.
+*
+* @param path Filesystem path
+* @param type File type
+*
+* @returns Number of characters successfully written.
+*/
 [[nodiscard]] size_t AppendStringToFile(const std::filesystem::path& path, FileType type,
                                         std::string_view string);
 
@@ -131,14 +132,14 @@ public:
                     FileShareFlag flag = FileShareFlag::ShareReadOnly);
 
     /**
-     * An IOFile is a lightweight wrapper on C Library file operations.
-     * Automatically closes an open file on the destruction of an IOFile object.
-     *
-     * @param path Filesystem path
-     * @param mode File access mode
-     * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
-     * @param flag (Windows only) File-share access flag, default is ShareReadOnly
-     */
+    * An IOFile is a lightweight wrapper on C Library file operations.
+    * Automatically closes an open file on the destruction of an IOFile object.
+    *
+    * @param path Filesystem path
+    * @param mode File access mode
+    * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
+    * @param flag (Windows only) File-share access flag, default is ShareReadOnly
+    */
     explicit IOFile(const std::filesystem::path& path, FileAccessMode mode,
                     FileType type = FileType::BinaryFile,
                     FileShareFlag flag = FileShareFlag::ShareReadOnly);
@@ -152,84 +153,70 @@ public:
     IOFile& operator=(IOFile&& other) noexcept;
 
     /**
-     * Gets the path of the file.
-     *
-     * @returns The path of the file.
-     */
+    * Gets the path of the file.
+    *
+    * @returns The path of the file.
+    */
     [[nodiscard]] std::filesystem::path GetPath() const;
 
     /**
-     * Gets the access mode of the file.
-     *
-     * @returns The access mode of the file.
-     */
+    * Gets the access mode of the file.
+    *
+    * @returns The access mode of the file.
+    */
     [[nodiscard]] FileAccessMode GetAccessMode() const;
 
     /**
-     * Gets the type of the file.
-     *
-     * @returns The type of the file.
-     */
+    * Gets the type of the file.
+    *
+    * @returns The type of the file.
+    */
     [[nodiscard]] FileType GetType() const;
 
     /**
-     * Opens a file at path with the specified file access mode.
-     * This function behaves differently depending on the FileAccessMode.
-     * These behaviors are documented in each enum value of FileAccessMode.
-     *
-     * @param path Filesystem path
-     * @param mode File access mode
-     * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
-     * @param flag (Windows only) File-share access flag, default is ShareReadOnly
-     */
+    * Opens a file at path with the specified file access mode.
+    * This function behaves differently depending on the FileAccessMode.
+    * These behaviors are documented in each enum value of FileAccessMode.
+    *
+    * @param path Filesystem path
+    * @param mode File access mode
+    * @param type File type, default is BinaryFile. Use TextFile to open the file as a text file
+    * @param flag (Windows only) File-share access flag, default is ShareReadOnly
+    */
     void Open(const std::filesystem::path& path, FileAccessMode mode,
-              FileType type = FileType::BinaryFile,
-              FileShareFlag flag = FileShareFlag::ShareReadOnly);
-
-// #ifdef _WIN32
-//     template <typename Path>
-//     void Open(const Path& path, FileAccessMode mode, FileType type = FileType::BinaryFile,
-//               FileShareFlag flag = FileShareFlag::ShareReadOnly) {
-//         using ValueType = typename Path::value_type;
-//         if constexpr (IsChar<ValueType>) {
-//             Open(ToU8String(path), mode, type, flag);
-//         } else {
-//             Open(std::filesystem::path{path}, mode, type, flag);
-//         }
-//     }
-// #endif
+            FileType type = FileType::BinaryFile,
+            FileShareFlag flag = FileShareFlag::ShareReadOnly);
 
     /// Closes the file if it is opened.
     void Close();
 
     /**
-     * Checks whether the file is open.
-     * Use this to check whether the calls to Open() or Close() succeeded.
-     *
-     * @returns True if the file is open, false otherwise.
-     */
+    * Checks whether the file is open.
+    * Use this to check whether the calls to Open() or Close() succeeded.
+    *
+    * @returns True if the file is open, false otherwise.
+    */
     [[nodiscard]] bool IsOpen() const;
 
     /**
-     * Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
-     * If T is not a contiguous container as defined by the concept IsContiguousContainer, this
-     * calls ReadObject and T must be a trivially copyable object.
-     *
-     * See ReadSpan for more details if T is a contiguous container.
-     * See ReadObject for more details if T is a trivially copyable object.
-     *
-     * @tparam T Contiguous container or trivially copyable object
-     *
-     * @param data Container of T::value_type data or reference to object
-     *
-     * @returns Count of T::value_type data or objects successfully read.
-     */
+    * Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
+    * If T is not a contiguous container as defined by the concept IsContiguousContainer, this
+    * calls ReadObject and T must be a trivially copyable object.
+    *
+    * See ReadSpan for more details if T is a contiguous container.
+    * See ReadObject for more details if T is a trivially copyable object.
+    *
+    * @tparam T Contiguous container or trivially copyable object
+    *
+    * @param data Container of T::value_type data or reference to object
+    *
+    * @returns Count of T::value_type data or objects successfully read.
+    */
     template <typename T>
     [[nodiscard]] size_t Read(T& data) const {
         if constexpr (IsContiguousContainer<T>) {
             using ContiguousType = typename T::value_type;
-            static_assert(std::is_trivially_copyable_v<ContiguousType>,
-                          "Data type must be trivially copyable.");
+            static_assert(std::is_trivially_copyable_v<ContiguousType>, "Data type must be trivially copyable.");
             return ReadSpan<ContiguousType>(data);
         } else {
             return ReadObject(data) ? 1 : 0;
@@ -237,25 +224,24 @@ public:
     }
 
     /**
-     * Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
-     * If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this
-     * calls WriteObject and T must be a trivially copyable object.
-     *
-     * See WriteSpan for more details if T is a contiguous container.
-     * See WriteObject for more details if T is a trivially copyable object.
-     *
-     * @tparam T Contiguous container or trivially copyable object
-     *
-     * @param data Container of T::value_type data or const reference to object
-     *
-     * @returns Count of T::value_type data or objects successfully written.
-     */
+    * Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
+    * If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this
+    * calls WriteObject and T must be a trivially copyable object.
+    *
+    * See WriteSpan for more details if T is a contiguous container.
+    * See WriteObject for more details if T is a trivially copyable object.
+    *
+    * @tparam T Contiguous container or trivially copyable object
+    *
+    * @param data Container of T::value_type data or const reference to object
+    *
+    * @returns Count of T::value_type data or objects successfully written.
+    */
     template <typename T>
     [[nodiscard]] size_t Write(const T& data) const {
         if constexpr (IsContiguousContainer<T>) {
             using ContiguousType = typename T::value_type;
-            static_assert(std::is_trivially_copyable_v<ContiguousType>,
-                          "Data type must be trivially copyable.");
+            static_assert(std::is_trivially_copyable_v<ContiguousType>, "Data type must be trivially copyable.");
             return WriteSpan<ContiguousType>(data);
         } else {
             static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
@@ -264,197 +250,219 @@ public:
     }
 
     /**
-     * Reads a span of T data from a file sequentially.
-     * This function reads from the current position of the file pointer and
-     * advances it by the (count of T * sizeof(T)) bytes successfully read.
-     *
-     * Failures occur when:
-     * - The file is not open
-     * - The opened file lacks read permissions
-     * - Attempting to read beyond the end-of-file
-     *
-     * @tparam T Data type
-     *
-     * @param data Span of T data
-     *
-     * @returns Count of T data successfully read.
-     */
+    * Reads a span of T data from a file sequentially.
+    * This function reads from the current position of the file pointer and
+    * advances it by the (count of T * sizeof(T)) bytes successfully read.
+    *
+    * Failures occur when:
+    * - The file is not open
+    * - The opened file lacks read permissions
+    * - Attempting to read beyond the end-of-file
+    *
+    * @tparam T Data type
+    *
+    * @param data Span of T data
+    *
+    * @returns Count of T data successfully read.
+    */
     template <typename T>
         requires std::is_trivially_copyable_v<T>
     [[nodiscard]] size_t ReadSpan(std::span<T> data) const {
-        if (!IsOpen()) {
-            return 0;
+        if (IsMappedFile()) {
+            std::memcpy(data.data(), mmap_base + mmap_offset, sizeof(T) * data.size());
+            return data.size();
         }
-        return std::fread(data.data(), sizeof(T), data.size(), file);
+        return IsOpen() ? std::fread(data.data(), sizeof(T), data.size(), file) : 0;
     }
 
     /**
-     * Writes a span of T data to a file sequentially.
-     * This function writes from the current position of the file pointer and
-     * advances it by the (count of T * sizeof(T)) bytes successfully written.
-     *
-     * Failures occur when:
-     * - The file is not open
-     * - The opened file lacks write permissions
-     *
-     * @tparam T Data type
-     *
-     * @param data Span of T data
-     *
-     * @returns Count of T data successfully written.
-     */
+    * Writes a span of T data to a file sequentially.
+    * This function writes from the current position of the file pointer and
+    * advances it by the (count of T * sizeof(T)) bytes successfully written.
+    *
+    * Failures occur when:
+    * - The file is not open
+    * - The opened file lacks write permissions
+    *
+    * @tparam T Data type
+    *
+    * @param data Span of T data
+    *
+    * @returns Count of T data successfully written.
+    */
     template <typename T>
     [[nodiscard]] size_t WriteSpan(std::span<const T> data) const {
         static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
-
-        if (!IsOpen()) {
-            return 0;
+        if (IsMappedFile()) {
+            std::memcpy(mmap_base + mmap_offset, data.data(), sizeof(T) * data.size());
+            return data.size();
         }
-
-        return std::fwrite(data.data(), sizeof(T), data.size(), file);
+        return IsOpen() ? std::fwrite(data.data(), sizeof(T), data.size(), file) : 0;
     }
 
     /**
-     * Reads a T object from a file sequentially.
-     * This function reads from the current position of the file pointer and
-     * advances it by the sizeof(T) bytes successfully read.
-     *
-     * Failures occur when:
-     * - The file is not open
-     * - The opened file lacks read permissions
-     * - Attempting to read beyond the end-of-file
-     *
-     * @tparam T Data type
-     *
-     * @param object Reference to object
-     *
-     * @returns True if the object is successfully read from the file, false otherwise.
-     */
+    * Reads a T object from a file sequentially.
+    * This function reads from the current position of the file pointer and
+    * advances it by the sizeof(T) bytes successfully read.
+    *
+    * Failures occur when:
+    * - The file is not open
+    * - The opened file lacks read permissions
+    * - Attempting to read beyond the end-of-file
+    *
+    * @tparam T Data type
+    *
+    * @param object Reference to object
+    *
+    * @returns True if the object is successfully read from the file, false otherwise.
+    */
     template <typename T>
     [[nodiscard]] bool ReadObject(T& object) const {
         static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
         static_assert(!std::is_pointer_v<T>, "T must not be a pointer to an object.");
-
-        if (!IsOpen()) {
-            return false;
+        if (IsMappedFile()) {
+            std::memcpy(&object, mmap_base + mmap_offset, sizeof(T));
+#ifdef _WIN32
+            return bool(sizeof(T));
+#else
+            return sizeof(T);
+#endif
         }
-
-        return std::fread(&object, sizeof(T), 1, file) == 1;
+        return IsOpen() ? std::fread(&object, sizeof(T), 1, file) == 1 : false;
     }
 
     /**
-     * Writes a T object to a file sequentially.
-     * This function writes from the current position of the file pointer and
-     * advances it by the sizeof(T) bytes successfully written.
-     *
-     * Failures occur when:
-     * - The file is not open
-     * - The opened file lacks write permissions
-     *
-     * @tparam T Data type
-     *
-     * @param object Const reference to object
-     *
-     * @returns True if the object is successfully written to the file, false otherwise.
-     */
+    * Writes a T object to a file sequentially.
+    * This function writes from the current position of the file pointer and
+    * advances it by the sizeof(T) bytes successfully written.
+    *
+    * Failures occur when:
+    * - The file is not open
+    * - The opened file lacks write permissions
+    *
+    * @tparam T Data type
+    *
+    * @param object Const reference to object
+    *
+    * @returns True if the object is successfully written to the file, false otherwise.
+    */
     template <typename T>
     [[nodiscard]] bool WriteObject(const T& object) const {
         static_assert(std::is_trivially_copyable_v<T>, "Data type must be trivially copyable.");
         static_assert(!std::is_pointer_v<T>, "T must not be a pointer to an object.");
-
-        if (!IsOpen()) {
-            return false;
+        if (IsMappedFile()) {
+            std::memcpy(mmap_base + mmap_offset, &object, sizeof(T));
+#ifdef _WIN32
+            return sizeof(T) != 0;
+#else
+            return sizeof(T);
+#endif
         }
-
-        return std::fwrite(&object, sizeof(T), 1, file) == 1;
+        return IsOpen() ? std::fwrite(&object, sizeof(T), 1, file) == 1 : false;
     }
 
     /**
-     * Specialized function to read a string of a given length from a file sequentially.
-     * This function writes from the current position of the file pointer and
-     * advances it by the number of characters successfully read.
-     * The size of the returned string may not match length if not all bytes are successfully read.
-     *
-     * @param length Length of the string
-     *
-     * @returns A string read from the file.
-     */
+    * Specialized function to read a string of a given length from a file sequentially.
+    * This function writes from the current position of the file pointer and
+    * advances it by the number of characters successfully read.
+    * The size of the returned string may not match length if not all bytes are successfully read.
+    *
+    * @param length Length of the string
+    *
+    * @returns A string read from the file.
+    */
     [[nodiscard]] std::string ReadString(size_t length) const;
 
     /**
-     * Specialized function to write a string to a file sequentially.
-     * This function writes from the current position of the file pointer and
-     * advances it by the number of characters successfully written.
-     *
-     * @param string Span of const char backed std::string or std::string_view
-     *
-     * @returns Number of characters successfully written.
-     */
+    * Specialized function to write a string to a file sequentially.
+    * This function writes from the current position of the file pointer and
+    * advances it by the number of characters successfully written.
+    *
+    * @param string Span of const char backed std::string or std::string_view
+    *
+    * @returns Number of characters successfully written.
+    */
     [[nodiscard]] size_t WriteString(std::span<const char> string) const;
 
     /**
-     * Attempts to flush any unwritten buffered data into the file.
-     *
-     * @returns True if the flush was successful, false otherwise.
-     */
+    * Attempts to flush any unwritten buffered data into the file.
+    *
+    * @returns True if the flush was successful, false otherwise.
+    */
     bool Flush() const;
 
     /**
-     * Attempts to commit the file into the disk.
-     * Note that this is an expensive operation as this forces the operating system to write
-     * the contents of the file associated with the file descriptor into the disk.
-     *
-     * @returns True if the commit was successful, false otherwise.
-     */
+    * Attempts to commit the file into the disk.
+    * Note that this is an expensive operation as this forces the operating system to write
+    * the contents of the file associated with the file descriptor into the disk.
+    *
+    * @returns True if the commit was successful, false otherwise.
+    */
     bool Commit() const;
 
     /**
-     * Resizes the file to a given size.
-     * If the file is resized to a smaller size, the remainder of the file is discarded.
-     * If the file is resized to a larger size, the new area appears as if zero-filled.
-     *
-     * Failures occur when:
-     * - The file is not open
-     *
-     * @param size File size in bytes
-     *
-     * @returns True if the file resize succeeded, false otherwise.
-     */
+    * Resizes the file to a given size.
+    * If the file is resized to a smaller size, the remainder of the file is discarded.
+    * If the file is resized to a larger size, the new area appears as if zero-filled.
+    *
+    * Failures occur when:
+    * - The file is not open
+    *
+    * @param size File size in bytes
+    *
+    * @returns True if the file resize succeeded, false otherwise.
+    */
     [[nodiscard]] bool SetSize(u64 size) const;
 
     /**
-     * Gets the size of the file.
-     *
-     * Failures occur when:
-     * - The file is not open
-     *
-     * @returns The file size in bytes of the file. Returns 0 on failure.
-     */
+    * Gets the size of the file.
+    *
+    * Failures occur when:
+    * - The file is not open
+    *
+    * @returns The file size in bytes of the file. Returns 0 on failure.
+    */
     [[nodiscard]] u64 GetSize() const;
 
     /**
-     * Moves the current position of the file pointer with the specified offset and seek origin.
-     *
-     * @param offset Offset from seek origin
-     * @param origin Seek origin
-     *
-     * @returns True if the file pointer has moved to the specified offset, false otherwise.
-     */
+    * Moves the current position of the file pointer with the specified offset and seek origin.
+    *
+    * @param offset Offset from seek origin
+    * @param origin Seek origin
+    *
+    * @returns True if the file pointer has moved to the specified offset, false otherwise.
+    */
     [[nodiscard]] bool Seek(s64 offset, SeekOrigin origin = SeekOrigin::SetOrigin) const;
 
     /**
-     * Gets the current position of the file pointer.
-     *
-     * @returns The current position of the file pointer.
-     */
+    * Gets the current position of the file pointer.
+    *
+    * @returns The current position of the file pointer.
+    */
     [[nodiscard]] s64 Tell() const;
 
-private:
+#ifdef _WIN32
+    inline bool IsMappedFile() const noexcept { return mapping_handle != nullptr; }
+#else // POSIX
+    inline bool IsMappedFile() const noexcept { return mmap_fd != -1; }
+#endif
+
     std::filesystem::path file_path;
     FileAccessMode file_access_mode{};
     FileType file_type{};
-
     std::FILE* file = nullptr;
+    // Any decent system should have mmap() for files
+    // Systems with artifical mmap() limitations should simply change the logic within file.cpp
+    // and reduce the threshold for which the mmap() is set to
+#ifdef _WIN32
+    void *mapping_handle = nullptr;
+    void *file_handle = nullptr;
+#else // POSIX
+    int mmap_fd = -1;
+#endif
+    u8* mmap_base = nullptr;
+    size_t mmap_size = 0;
+    mutable s64 mmap_offset = 0; // fuck you
 };
 
 } // namespace Common::FS

src/common/scratch_buffer.h

@@ -1,13 +1,9 @@
-// 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"
 
@@ -65,7 +61,7 @@ public:
     void resize(size_type size) {
         if (size > buffer_capacity) {
             auto new_buffer = Common::make_unique_for_overwrite<T[]>(size);
-            std::memcpy(new_buffer.get(), buffer.get(), buffer_capacity * sizeof(T));
+            std::move(buffer.get(), buffer.get() + buffer_capacity, new_buffer.get());
             buffer = std::move(new_buffer);
             buffer_capacity = size;
         }

src/common/uuid.h

@@ -10,7 +10,6 @@
 #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 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,7 +6,6 @@
 
 #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,7 +7,6 @@
 #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,7 +4,6 @@
 // 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,13 +1,9 @@
-// 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 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,7 +6,6 @@
 
 #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,8 +6,6 @@
 
 #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,12 +1,8 @@
-// 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,9 +6,6 @@
 
 #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,15 +1,9 @@
-// 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 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -6,8 +6,6 @@
 
 #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,14 +1,8 @@
-// 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,7 +7,6 @@
 #pragma once
 
 #include <memory>
-#include <type_traits>
 
 #include "common/common_funcs.h"
 #include "common/page_table.h"

src/core/hle/result.h

@@ -6,7 +6,6 @@
 
 #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,13 +1,9 @@
-// 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,10 +175,19 @@ Result AlbumManager::LoadAlbumScreenShotImage(LoadAlbumScreenShotImageOutput& ou
         return ResultIsNotMounted;
     }
 
-    out_image_output = {};
-    out_image_output.width = 1280;
-    out_image_output.height = 720;
-    out_image_output.attribute.orientation = AlbumImageOrientation::None;
+    out_image_output = {
+        .width = 1280,
+        .height = 720,
+        .attribute =
+            {
+                .unknown_0{},
+                .orientation = AlbumImageOrientation::None,
+                .unknown_1{},
+                .unknown_2{},
+                .pad163{},
+            },
+        .pad179{},
+    };
 
     std::filesystem::path path;
     const auto result = GetFile(path, file_id);
@@ -202,10 +211,19 @@ Result AlbumManager::LoadAlbumScreenShotThumbnail(
         return ResultIsNotMounted;
     }
 
-    out_image_output = {};
-    out_image_output.width = 320;
-    out_image_output.height = 180;
-    out_image_output.attribute.orientation = AlbumImageOrientation::None;
+    out_image_output = {
+        .width = 320,
+        .height = 180,
+        .attribute =
+            {
+                .unknown_0{},
+                .orientation = AlbumImageOrientation::None,
+                .unknown_1{},
+                .unknown_2{},
+                .pad163{},
+            },
+        .pad179{},
+    };
 
     std::filesystem::path path;
     const auto result = GetFile(path, file_id);

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

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

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

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

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

@@ -8,7 +8,6 @@
 
 #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,13 +1,10 @@
-// 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,7 +7,6 @@
 #pragma once
 
 #include <array>
-#include <type_traits>
 
 #include "common/bit_field.h"
 #include "common/common_funcs.h"

src/hid_core/hid_types.h

@@ -1,15 +1,8 @@
-// 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/shader_recompiler/CMakeLists.txt

@@ -6,6 +6,55 @@
 
 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
@@ -190,60 +239,9 @@ 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,6 +553,17 @@ 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/host1x/codec_types.h

@@ -8,7 +8,6 @@
 
 #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,15 +1,8 @@
-// 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,7 +7,6 @@
 #pragma once
 
 #include <memory>
-#include <type_traits>
 
 #include "common/common_types.h"
 #include "common/scratch_buffer.h"

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.
-            void(std::exchange(lock, std::unique_lock{swapchain_mutex}));
+            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.
-            void(std::exchange(lk, std::unique_lock{execution_mutex}));
+            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,329 +26,350 @@
 #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;
+        [[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;
         }
-        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;
+        [[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{};
         }
-        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 {};
+        [[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 {};
         }
-        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;
+        [[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;
         }
-        return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
-    }
-} // namespace
+
+
+// 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
 
 //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
-    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
+    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() &&
-            memory != VK_NULL_HANDLE) {
-            GPU::Logging::GPULogger::GetInstance().LogMemoryDeallocation(
-                reinterpret_cast<uintptr_t>(memory)
+            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)
             );
         }
+    }
 
-        if (mapped_ptr) {
+    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;
         }
-        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} {
+    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)
+                );
+            }
 
-    // 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);
+            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);
+                        }
                     }
                 }
-            }
-        });
+            });
+        }
     }
-}
 
-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,
+    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),
             .requiredFlags = 0,
-            .preferredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-            .memoryTypeBits = 0,
+            .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
+            .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
             .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));
+        VkBuffer handle{};
+        VmaAllocationInfo alloc_info{};
+        VmaAllocation allocation{};
+        VkMemoryPropertyFlags property_flags{};
 
-    // 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
-        );
-    }
+        vk::Check(vmaCreateBuffer(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
+        vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);
 
-    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),
-        .requiredFlags = 0,
-        .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
-        .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
-        .pool = VK_NULL_HANDLE,
-        .pUserData = nullptr,
-        .priority = 0.f,
-    };
-
-    VkBuffer handle{};
-    VmaAllocationInfo alloc_info{};
-    VmaAllocation allocation{};
-    VkMemoryPropertyFlags property_flags{};
-
-    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());
-}
-
-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{};
-
-    VkResult res = vmaAllocateMemory(allocator, &reqs, &ci, &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);
-
-        // 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);
+        // 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());
     }
 
-    vk::Check(res);
-    return MemoryCommit(allocator, a, info);
-}
+    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);
 
-MemoryCommit MemoryAllocator::Commit(const vk::Buffer &buffer, MemoryUsage usage) {
-    // Allocate memory appropriate for this buffer automatically
-    const auto vma_usage = MemoryUsageVma(usage);
+        VmaAllocation a{};
+        VmaAllocationInfo info{};
 
-    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;
+        VkResult res = vmaAllocateMemory(allocator, &reqs, &ci, &a, &info);
 
-    const VkBuffer raw = *buffer;
+        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);
 
-    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);
+            // 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);
     }
 
-    vk::Check(res);
-    vk::Check(vmaBindBufferMemory2(allocator, a, 0, raw, nullptr));
-    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 1
+#define VMA_IMPLEMENTATION
 #include "video_core/vulkan_common/vma.h"
 #endif