better logic

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

.gitignore

@@ -63,6 +63,3 @@ artifacts
 /install*
 vulkansdk*.exe
 *.tar.zst
-
-# Build-time generated external sources
-externals/generated

.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")
@@ -215,6 +214,8 @@ if(MSVC)
 endif()
 
 # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
+cmake_dependent_option(YUZU_USE_BUNDLED_SDL3 "Download bundled SDL3 build" "${MSVC}" "NOT ANDROID" OFF)
+
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
 set(EXT_DEFAULT OFF)
@@ -222,8 +223,6 @@ if (MSVC OR ANDROID)
     set(EXT_DEFAULT ON)
 endif()
 
-option(YUZU_USE_BUNDLED_SDL3 "Download bundled SDL3 build" ${EXT_DEFAULT})
-
 # ffmpeg
 option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
 cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${SOLARIS}" "NOT WIN32 AND NOT ANDROID" OFF)
@@ -239,7 +238,7 @@ option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
 # FreeBSD 15+ has libusb, versions below should disable it
 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR LINUX OR FREEBSD OR APPLE" OFF)
 
-cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT (WIN32 AND ARCHITECTURE_arm64) AND NOT APPLE AND NOT ANDROID" OFF)
+cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT (WIN32 AND ARCHITECTURE_arm64) AND NOT APPLE" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
@@ -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

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

docs/Options.md

@@ -76,7 +76,7 @@ The following options are desktop only.
 
 - `ENABLE_LIBUSB` (ON) Enable the use of the libusb input backend (HIGHLY RECOMMENDED)
 - `ENABLE_OPENGL` (ON) Enable the OpenGL graphics backend
-  - Unavailable on Windows/ARM64 and on Android
+  - Unavailable on Windows/ARM64
   - You probably shouldn't turn this off.
 
 ### Qt

externals/CMakeLists.txt

@@ -136,50 +136,49 @@ if(ENABLE_CUBEB)
     endif()
 endif()
 
-if (NOT YUZU_USE_BUNDLED_SDL3)
+if (NOT ANDROID)
-    if (NOT WIN32)
+    if (NOT YUZU_USE_BUNDLED_SDL3)
-        # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
+        if (NOT WIN32)
-        # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
+            # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
-        # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
+            # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
-        # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
+            # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
-        set(SDL_UNUSED_SUBSYSTEMS
+            # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
-            File Filesystem
+            set(SDL_UNUSED_SUBSYSTEMS
-            Locale Power Render)
+                File Filesystem
-        foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
+                Locale Power Render)
-          string(TOUPPER ${_SUB} _OPT)
+            foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
-          set(SDL_${_OPT} OFF)
+              string(TOUPPER ${_SUB} _OPT)
-        endforeach()
+              set(SDL_${_OPT} OFF)
+            endforeach()
 
-        set(HIDAPI ON)
+            set(HIDAPI ON)
-    endif()
+        endif()
 
-    if (APPLE)
+        if (APPLE)
-        set(SDL_FILE ON)
+            set(SDL_FILE ON)
-    endif()
+        endif()
 
-    AddJsonPackage(sdl3)
+        AddJsonPackage(sdl3)
-else()
-    message(STATUS "Using bundled SDL3")
-    AddJsonPackage(sdl3-ci)
-
-    # copy sdl java sources for consumption by Gradle
-    if (ANDROID)
-        file(COPY ${SDL3_SOURCE_DIR}/java DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/generated/sdl)
-    endif()
-endif()
-
-# Normalize SDL3 link target across package variants.
-# Some SDL3 packages export only SDL3::SDL3-shared or SDL3::SDL3-static.
-if (NOT TARGET SDL3::SDL3)
-    if (TARGET SDL3::SDL3-shared)
-        add_library(SDL3::SDL3 ALIAS SDL3::SDL3-shared)
-    elseif (TARGET SDL3::SDL3-static)
-        add_library(SDL3::SDL3 ALIAS SDL3::SDL3-static)
     else()
-        message(FATAL_ERROR "SDL3 package found, but no usable SDL3 target was exported")
+        message(STATUS "Using bundled SDL3")
+        AddJsonPackage(sdl3-ci)
+    endif()
+
+    # Normalize SDL3 link target across package variants.
+    # Some SDL3 packages export only SDL3::SDL3-shared or SDL3::SDL3-static.
+    if (NOT TARGET SDL3::SDL3)
+        if (TARGET SDL3::SDL3-shared)
+            add_library(SDL3::SDL3 ALIAS SDL3::SDL3-shared)
+        elseif (TARGET SDL3::SDL3-static)
+            add_library(SDL3::SDL3 ALIAS SDL3::SDL3-static)
+        else()
+            message(FATAL_ERROR "SDL3 package found, but no usable SDL3 target was exported")
+        endif()
     endif()
 endif()
 
+set(BUILD_SHARED_LIBS OFF)
+
 # SPIRV Headers
 AddJsonPackage(spirv-headers)
 
@@ -386,6 +385,13 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
     endif()
 endif()
 
+# oboe
+if (ANDROID)
+    AddJsonPackage(oboe)
+
+    add_library(oboe::oboe ALIAS oboe)
+endif()
+
 if (APPLE)
     # moltenvk
     if (NOT YUZU_USE_BUNDLED_MOLTENVK)

externals/tz/tz/tz.h

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

src/android/app/build.gradle.kts

@@ -272,13 +272,6 @@ android {
         resValue("string", "app_name_suffixed", "$currentName$suffix")
         resValue("string", "app_name", "Eden$suffix")
     }
-
-    sourceSets {
-        named("main") {
-            java.srcDir("${edenDir}/externals/generated/sdl/java")
-            kotlin.srcDir("${edenDir}/externals/generated/sdl/java")
-        }
-    }
 }
 
 idea {

src/android/app/proguard-rules.pro

@@ -9,9 +9,6 @@
 -keep class org.ini4j.spi.IniBuilder
 -keep class org.ini4j.spi.IniFormatter
 
--keep class org.libsdl.app.** { *; }
--keepclassmembers class org.libsdl.app.** { *; }
-
 # Suppress warnings for R8
 -dontwarn org.bouncycastle.jsse.BCSSLParameters
 -dontwarn org.bouncycastle.jsse.BCSSLSocket

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -16,7 +16,6 @@ import android.widget.TextView
 import androidx.annotation.Keep
 import androidx.core.net.toUri
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.libsdl.app.SDL
 import java.lang.ref.WeakReference
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.fragments.CoreErrorDialogFragment
@@ -53,8 +52,6 @@ object NativeLibrary {
     init {
         try {
             System.loadLibrary("yuzu-android")
-            SDL.setupJNI()
-            initJvm()
         } catch (ex: UnsatisfiedLinkError) {
             error("[NativeLibrary] $ex")
         }
@@ -370,7 +367,6 @@ object NativeLibrary {
         NetPlayManager.clearChat()
     }
 
-    external fun initJvm()
     external fun initMultiplayer()
 
     @Keep

src/android/app/src/main/jni/CMakeLists.txt

@@ -22,7 +22,7 @@ add_library(yuzu-android SHARED
 set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})
 
 target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common video_core)
-target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log GLESv2)
+target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log)
 if (ARCHITECTURE_arm64)
     target_link_libraries(yuzu-android PRIVATE adrenotools)
 endif()

src/android/app/src/main/jni/native.cpp

@@ -1730,15 +1730,6 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_loadAmiibo(JNIEnv* env, jobject jobj,
     return static_cast<jint>(info);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_NativeLibrary_initJvm(JNIEnv *env, jclass clazz) {
-    JavaVM *vm;
-    if (env->GetJavaVM(&vm) != JNI_OK)
-        return;
-
-    Common::Android::Initialize(vm, env);
-}
-
 JNIEXPORT void JNICALL
 Java_org_yuzu_yuzu_1emu_NativeLibrary_initMultiplayer(
         JNIEnv* env, [[maybe_unused]] jobject obj) {

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

@@ -800,6 +800,7 @@
     <string name="theme_mode_dark">تاریک</string>
 
     <!-- Audio output engines -->
+    <string name="oboe">oboe</string>
     <string name="cubeb">cubeb</string>
 
     <!-- Anisotropic filtering options -->

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

@@ -465,13 +465,13 @@
 
     <string-array name="outputEngineEntries">
         <item>@string/auto</item>
-        <item>@string/sdl3</item>
+        <item>@string/oboe</item>
         <item>@string/cubeb</item>
         <item>@string/string_null</item>
     </string-array>
     <integer-array name="outputEngineValues">
         <item>0</item>
-        <item>2</item>
+        <item>4</item>
         <item>1</item>
         <item>3</item>
     </integer-array>

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

@@ -1240,7 +1240,7 @@
     <string name="theme_mode_dark">Dark</string>
 
     <!-- Audio output engines -->
-    <string name="sdl3" translatable="false">SDL3</string>
+    <string name="oboe" translatable="false">oboe</string>
     <string name="cubeb" translatable="false">cubeb</string>
 
     <!-- Anisotropic filtering options -->

src/audio_core/CMakeLists.txt

@@ -238,11 +238,20 @@ if (ENABLE_CUBEB)
     target_compile_definitions(audio_core PRIVATE HAVE_CUBEB=1)
 endif()
 
-target_sources(audio_core PRIVATE
+if(ANDROID)
-    sink/sdl3_sink.cpp
+    target_sources(audio_core PRIVATE
-    sink/sdl3_sink.h)
+        sink/oboe_sink.cpp
+        sink/oboe_sink.h)
 
-target_link_libraries(audio_core PRIVATE SDL3::SDL3)
+    target_link_libraries(audio_core PRIVATE oboe)
-target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
+    target_compile_definitions(audio_core PUBLIC HAVE_OBOE)
+else()
+    target_sources(audio_core PRIVATE
+        sink/sdl3_sink.cpp
+        sink/sdl3_sink.h)
+
+    target_link_libraries(audio_core PRIVATE SDL3::SDL3)
+    target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
+endif()
 
 create_target_directory_groups(audio_core)

src/audio_core/sink/oboe_sink.cpp

@@ -0,0 +1,230 @@
+// 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
+
+#include <span>
+#include <vector>
+
+#include <oboe/Oboe.h>
+
+#include "audio_core/common/common.h"
+#include "audio_core/sink/oboe_sink.h"
+#include "audio_core/sink/sink_stream.h"
+#include "common/logging.h"
+#include "common/scope_exit.h"
+#include "core/core.h"
+
+namespace AudioCore::Sink {
+
+class OboeSinkStream final : public SinkStream,
+                             public oboe::AudioStreamDataCallback,
+                             public oboe::AudioStreamErrorCallback {
+public:
+    explicit OboeSinkStream(Core::System& system_, StreamType type_, const std::string& name_,
+                            u32 system_channels_)
+        : SinkStream(system_, type_) {
+        name = name_;
+        system_channels = system_channels_;
+
+        this->OpenStream();
+    }
+
+    ~OboeSinkStream() override {
+        LOG_INFO(Audio_Sink, "Destroyed Oboe stream");
+    }
+
+    void Finalize() override {
+        this->Stop();
+        m_stream.reset();
+    }
+
+    void Start(bool resume = false) override {
+        if (!m_stream || !paused) {
+            return;
+        }
+
+        paused = false;
+
+        if (m_stream->start() != oboe::Result::OK) {
+            LOG_CRITICAL(Audio_Sink, "Error starting Oboe stream");
+        }
+    }
+
+    void Stop() override {
+        if (!m_stream || paused) {
+            return;
+        }
+
+        this->SignalPause();
+
+        if (m_stream->stop() != oboe::Result::OK) {
+            LOG_CRITICAL(Audio_Sink, "Error stopping Oboe stream");
+        }
+    }
+
+public:
+    static s32 QueryChannelCount(oboe::Direction direction) {
+        std::shared_ptr<oboe::AudioStream> temp_stream;
+        oboe::AudioStreamBuilder builder;
+
+        const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
+        if (result == oboe::Result::OK) {
+            return temp_stream->getChannelCount() >= 6 ? 6 : 2;
+        }
+
+        LOG_ERROR(Audio_Sink, "Failed to open {} stream. Using default channel count 2",
+                  direction == oboe::Direction::Output ? "output" : "input");
+        return 2;
+    }
+
+protected:
+    oboe::DataCallbackResult onAudioReady(oboe::AudioStream*, void* audio_data,
+                                          s32 num_buffer_frames) override {
+        const size_t num_channels = this->GetDeviceChannels();
+        const size_t frame_size = num_channels;
+        const size_t num_frames = static_cast<size_t>(num_buffer_frames);
+
+        if (type == StreamType::In) {
+            std::span<const s16> input_buffer{reinterpret_cast<const s16*>(audio_data),
+                                              num_frames * frame_size};
+            this->ProcessAudioIn(input_buffer, num_frames);
+        } else {
+            std::span<s16> output_buffer{reinterpret_cast<s16*>(audio_data),
+                                         num_frames * frame_size};
+            this->ProcessAudioOutAndRender(output_buffer, num_frames);
+        }
+
+        return oboe::DataCallbackResult::Continue;
+    }
+
+    void onErrorAfterClose(oboe::AudioStream*, oboe::Result) override {
+        LOG_INFO(Audio_Sink, "Audio stream closed, reinitializing");
+
+        if (this->OpenStream()) {
+            m_stream->start();
+        }
+    }
+
+private:
+    static oboe::AudioStreamBuilder* ConfigureBuilder(oboe::AudioStreamBuilder& builder,
+                                                      oboe::Direction direction) {
+        // TODO: investigate callback delay issues when using AAudio
+        return builder.setPerformanceMode(oboe::PerformanceMode::LowLatency)
+            ->setAudioApi(oboe::AudioApi::OpenSLES)
+            ->setDirection(direction)
+            ->setSampleRate(TargetSampleRate)
+            ->setSampleRateConversionQuality(oboe::SampleRateConversionQuality::High)
+            ->setFormat(oboe::AudioFormat::I16)
+            ->setFormatConversionAllowed(true)
+            ->setUsage(oboe::Usage::Game)
+            ->setBufferCapacityInFrames(TargetSampleCount * 2);
+    }
+
+    bool OpenStream() {
+        const auto direction = [&]() {
+            switch (type) {
+            case StreamType::In:
+                return oboe::Direction::Input;
+            case StreamType::Out:
+            case StreamType::Render:
+                return oboe::Direction::Output;
+            default:
+                ASSERT(false);
+                return oboe::Direction::Output;
+            }
+        }();
+
+        const auto expected_channels = QueryChannelCount(direction);
+        const auto expected_mask = [&]() {
+            switch (expected_channels) {
+            case 1:
+                return oboe::ChannelMask::Mono;
+            case 2:
+                return oboe::ChannelMask::Stereo;
+            case 6:
+                return oboe::ChannelMask::CM5Point1;
+            default:
+                ASSERT(false);
+                return oboe::ChannelMask::Unspecified;
+            }
+        }();
+
+        oboe::AudioStreamBuilder builder;
+        const auto result = ConfigureBuilder(builder, direction)
+                                ->setChannelCount(expected_channels)
+                                ->setChannelMask(expected_mask)
+                                ->setChannelConversionAllowed(true)
+                                ->setDataCallback(this)
+                                ->setErrorCallback(this)
+                                ->openStream(m_stream);
+        ASSERT(result == oboe::Result::OK);
+        return result == oboe::Result::OK && this->SetStreamProperties();
+    }
+
+    bool SetStreamProperties() {
+        ASSERT(m_stream);
+
+        m_stream->setBufferSizeInFrames(TargetSampleCount * 2);
+        device_channels = m_stream->getChannelCount();
+
+        const auto sample_rate = m_stream->getSampleRate();
+        const auto buffer_capacity = m_stream->getBufferCapacityInFrames();
+        const auto stream_backend =
+            m_stream->getAudioApi() == oboe::AudioApi::AAudio ? "AAudio" : "OpenSLES";
+
+        LOG_INFO(Audio_Sink, "Opened Oboe {} stream with {} channels sample rate {} capacity {}",
+                 stream_backend, device_channels, sample_rate, buffer_capacity);
+
+        return true;
+    }
+
+    std::shared_ptr<oboe::AudioStream> m_stream{};
+};
+
+OboeSink::OboeSink() {
+    // TODO: This is not generally knowable
+    // The channel count is distinct based on direction and can change
+    device_channels = OboeSinkStream::QueryChannelCount(oboe::Direction::Output);
+}
+
+OboeSink::~OboeSink() = default;
+
+SinkStream* OboeSink::AcquireSinkStream(Core::System& system, u32 system_channels,
+                                        const std::string& name, StreamType type) {
+    SinkStreamPtr& stream = sink_streams.emplace_back(
+        std::make_unique<OboeSinkStream>(system, type, name, system_channels));
+
+    return stream.get();
+}
+
+void OboeSink::CloseStream(SinkStream* to_remove) {
+    sink_streams.remove_if([&](auto& stream) { return stream.get() == to_remove; });
+}
+
+void OboeSink::CloseStreams() {
+    sink_streams.clear();
+}
+
+f32 OboeSink::GetDeviceVolume() const {
+    if (sink_streams.empty()) {
+        return 1.0f;
+    }
+
+    return sink_streams.front()->GetDeviceVolume();
+}
+
+void OboeSink::SetDeviceVolume(f32 volume) {
+    for (auto& stream : sink_streams) {
+        stream->SetDeviceVolume(volume);
+    }
+}
+
+void OboeSink::SetSystemVolume(f32 volume) {
+    for (auto& stream : sink_streams) {
+        stream->SetSystemVolume(volume);
+    }
+}
+
+} // namespace AudioCore::Sink

src/audio_core/sink/oboe_sink.h

@@ -0,0 +1,75 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <list>
+#include <string>
+
+#include "audio_core/sink/sink.h"
+
+namespace Core {
+class System;
+}
+
+namespace AudioCore::Sink {
+class SinkStream;
+
+class OboeSink final : public Sink {
+public:
+    explicit OboeSink();
+    ~OboeSink() override;
+
+    /**
+     * Create a new sink stream.
+     *
+     * @param system          - Core system.
+     * @param system_channels - Number of channels the audio system expects.
+     *                          May differ from the device's channel count.
+     * @param name            - Name of this stream.
+     * @param type            - Type of this stream, render/in/out.
+     *
+     * @return A pointer to the created SinkStream
+     */
+    SinkStream* AcquireSinkStream(Core::System& system, u32 system_channels,
+                                  const std::string& name, StreamType type) override;
+
+    /**
+     * Close a given stream.
+     *
+     * @param stream - The stream to close.
+     */
+    void CloseStream(SinkStream* stream) override;
+
+    /**
+     * Close all streams.
+     */
+    void CloseStreams() override;
+
+    /**
+     * Get the device volume. Set from calls to the IAudioDevice service.
+     *
+     * @return Volume of the device.
+     */
+    f32 GetDeviceVolume() const override;
+
+    /**
+     * Set the device volume. Set from calls to the IAudioDevice service.
+     *
+     * @param volume - New volume of the device.
+     */
+    void SetDeviceVolume(f32 volume) override;
+
+    /**
+     * Set the system volume. Comes from the audio system using this stream.
+     *
+     * @param volume - New volume of the system.
+     */
+    void SetSystemVolume(f32 volume) override;
+
+private:
+    /// List of streams managed by this sink
+    std::list<SinkStreamPtr> sink_streams{};
+};
+
+} // namespace AudioCore::Sink

src/audio_core/sink/sink_details.cpp

@@ -10,6 +10,9 @@
 #include <vector>
 
 #include "audio_core/sink/sink_details.h"
+#ifdef HAVE_OBOE
+#include "audio_core/sink/oboe_sink.h"
+#endif
 #ifdef HAVE_CUBEB
 #include "audio_core/sink/cubeb_sink.h"
 #endif
@@ -40,8 +43,24 @@ struct SinkDetails {
     /// SuitableFn is_suitable; // REVERTED FOR LatencyFn latency ABOVE - DIABLO 3 FIX
 };
 
+// NOTE TO PROBABLY FIX LATER FOR ANDROID - the return value "0u" for the first HAVE_OBOE
+// section below was just copied from the null section so there's a somewhat valid value
+// being returned, since the previous "true" value probably isn't compatible with the
+// previous EA-3833 code. (HAVE_OBOE was introduced in a later release.) Eventually need
+// to change "0u" for something else directly from the oboe_sink.cpp functions.
+
 // sink_details is ordered in terms of desirability, with the best choice at the top.
 constexpr SinkDetails sink_details[] = {
+#ifdef HAVE_OBOE
+    SinkDetails{
+        Settings::AudioEngine::Oboe,
+        [](std::string_view device_id) -> std::unique_ptr<Sink> {
+            return std::make_unique<OboeSink>();
+        },
+        [](bool capture) { return std::vector<std::string>{"Default"}; },
+        []() { return 0u; },
+    },
+#endif
 #ifdef HAVE_CUBEB
     SinkDetails{
         Settings::AudioEngine::Cubeb,

src/common/android/android_common.cpp

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "android_common.h"
@@ -51,7 +51,7 @@ jstring ToJString(JNIEnv* env, std::u16string_view str) {
 }
 
 double GetJDouble(JNIEnv* env, jobject jdouble) {
-    return env->CallDoubleMethod(jdouble, GetDoubleValueMethod());
+    return env->GetDoubleField(jdouble, GetDoubleValueField());
 }
 
 jobject ToJDouble(JNIEnv* env, double value) {
@@ -59,7 +59,7 @@ jobject ToJDouble(JNIEnv* env, double value) {
 }
 
 s32 GetJInteger(JNIEnv* env, jobject jinteger) {
-    return env->CallIntMethod(jinteger, GetIntegerValueMethod());
+    return env->GetIntField(jinteger, GetIntegerValueField());
 }
 
 jobject ToJInteger(JNIEnv* env, s32 value) {
@@ -67,7 +67,7 @@ jobject ToJInteger(JNIEnv* env, s32 value) {
 }
 
 bool GetJBoolean(JNIEnv* env, jobject jboolean) {
-    return env->CallBooleanMethod(jboolean, GetBooleanValueMethod());
+    return env->GetBooleanField(jboolean, GetBooleanValueField());
 }
 
 jobject ToJBoolean(JNIEnv* env, bool value) {

src/common/android/id_cache.cpp

@@ -63,15 +63,15 @@ static jfieldID s_patch_title_id_field;
 
 static jclass s_double_class;
 static jmethodID s_double_constructor;
-static jmethodID s_double_value_method;
+static jfieldID s_double_value_field;
 
 static jclass s_integer_class;
 static jmethodID s_integer_constructor;
-static jmethodID s_integer_value_method;
+static jfieldID s_integer_value_field;
 
 static jclass s_boolean_class;
 static jmethodID s_boolean_constructor;
-static jmethodID s_boolean_value_method;
+static jfieldID s_boolean_value_field;
 
 static jclass s_player_input_class;
 static jmethodID s_player_input_constructor;
@@ -103,6 +103,7 @@ static jmethodID s_clear_chat;
 static constexpr jint JNI_VERSION = JNI_VERSION_1_6;
 
 namespace Common::Android {
+
     JNIEnv *GetEnvForThread() {
         thread_local static struct OwnedEnv {
             OwnedEnv() {
@@ -298,8 +299,8 @@ namespace Common::Android {
         return s_double_constructor;
     }
 
-    jmethodID GetDoubleValueMethod() {
+    jfieldID GetDoubleValueField() {
-        return s_double_value_method;
+        return s_double_value_field;
     }
 
     jclass GetIntegerClass() {
@@ -310,8 +311,8 @@ namespace Common::Android {
         return s_integer_constructor;
     }
 
-    jmethodID GetIntegerValueMethod() {
+    jfieldID GetIntegerValueField() {
-        return s_integer_value_method;
+        return s_integer_value_field;
     }
 
     jclass GetBooleanClass() {
@@ -322,8 +323,8 @@ namespace Common::Android {
         return s_boolean_constructor;
     }
 
-    jmethodID GetBooleanValueMethod() {
+    jfieldID GetBooleanValueField() {
-        return s_boolean_value_method;
+        return s_boolean_value_field;
     }
 
     jclass GetPlayerInputClass() {
@@ -428,6 +429,188 @@ namespace Common::Android {
 
     jint InitFFmpegOnLoad(JavaVM *vm);
 
+    jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+        s_java_vm = vm;
+        InitFFmpegOnLoad(vm);
+
+        JNIEnv *env;
+        if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION) != JNI_OK)
+            return JNI_ERR;
+
+        // Initialize Java classes
+        const jclass native_library_class = env->FindClass("org/yuzu/yuzu_emu/NativeLibrary");
+        s_native_library_class = reinterpret_cast<jclass>(env->NewGlobalRef(native_library_class));
+        s_disk_cache_progress_class = reinterpret_cast<jclass>(env->NewGlobalRef(
+                env->FindClass("org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress")));
+        s_load_callback_stage_class = reinterpret_cast<jclass>(env->NewGlobalRef(env->FindClass(
+                "org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage")));
+
+        const jclass game_dir_class = env->FindClass("org/yuzu/yuzu_emu/model/GameDir");
+        s_game_dir_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_dir_class));
+        s_game_dir_constructor = env->GetMethodID(game_dir_class, "<init>",
+                                                  "(Ljava/lang/String;Z)V");
+        env->DeleteLocalRef(game_dir_class);
+
+        // Initialize methods
+        s_exit_emulation_activity =
+                env->GetStaticMethodID(s_native_library_class, "exitEmulationActivity", "(I)V");
+        s_disk_cache_load_progress =
+                env->GetStaticMethodID(s_disk_cache_progress_class, "loadProgress", "(III)V");
+        s_copy_to_storage = env->GetStaticMethodID(s_native_library_class, "copyFileToStorage",
+                                                   "(Ljava/lang/String;Ljava/lang/String;)Z");
+        s_file_exists = env->GetStaticMethodID(s_native_library_class, "exists",
+                                               "(Ljava/lang/String;)Z");
+        s_file_extension = env->GetStaticMethodID(s_native_library_class, "getFileExtension",
+                                               "(Ljava/lang/String;)Ljava/lang/String;");
+        s_on_emulation_started =
+                env->GetStaticMethodID(s_native_library_class, "onEmulationStarted", "()V");
+        s_on_emulation_stopped =
+                env->GetStaticMethodID(s_native_library_class, "onEmulationStopped", "(I)V");
+        s_on_program_changed =
+                env->GetStaticMethodID(s_native_library_class, "onProgramChanged", "(I)V");
+
+        const jclass game_class = env->FindClass("org/yuzu/yuzu_emu/model/Game");
+        s_game_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_class));
+        s_game_constructor = env->GetMethodID(game_class, "<init>",
+                                              "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/"
+                                              "String;Ljava/lang/String;Ljava/lang/String;Z)V");
+        s_game_title_field = env->GetFieldID(game_class, "title", "Ljava/lang/String;");
+        s_game_path_field = env->GetFieldID(game_class, "path", "Ljava/lang/String;");
+        s_game_program_id_field = env->GetFieldID(game_class, "programId", "Ljava/lang/String;");
+        s_game_developer_field = env->GetFieldID(game_class, "developer", "Ljava/lang/String;");
+        s_game_version_field = env->GetFieldID(game_class, "version", "Ljava/lang/String;");
+        s_game_is_homebrew_field = env->GetFieldID(game_class, "isHomebrew", "Z");
+        env->DeleteLocalRef(game_class);
+
+        const jclass string_class = env->FindClass("java/lang/String");
+        s_string_class = reinterpret_cast<jclass>(env->NewGlobalRef(string_class));
+        env->DeleteLocalRef(string_class);
+
+        const jclass pair_class = env->FindClass("kotlin/Pair");
+        s_pair_class = reinterpret_cast<jclass>(env->NewGlobalRef(pair_class));
+        s_pair_constructor =
+                env->GetMethodID(pair_class, "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
+        s_pair_first_field = env->GetFieldID(pair_class, "first", "Ljava/lang/Object;");
+        s_pair_second_field = env->GetFieldID(pair_class, "second", "Ljava/lang/Object;");
+        env->DeleteLocalRef(pair_class);
+
+        const jclass overlay_control_data_class =
+                env->FindClass("org/yuzu/yuzu_emu/overlay/model/OverlayControlData");
+        s_overlay_control_data_class =
+                reinterpret_cast<jclass>(env->NewGlobalRef(overlay_control_data_class));
+        s_overlay_control_data_constructor =
+                env->GetMethodID(overlay_control_data_class, "<init>",
+                                 "(Ljava/lang/String;ZLkotlin/Pair;Lkotlin/Pair;Lkotlin/Pair;F)V");
+        s_overlay_control_data_id_field =
+                env->GetFieldID(overlay_control_data_class, "id", "Ljava/lang/String;");
+        s_overlay_control_data_enabled_field =
+                env->GetFieldID(overlay_control_data_class, "enabled", "Z");
+        s_overlay_control_data_landscape_position_field =
+                env->GetFieldID(overlay_control_data_class, "landscapePosition", "Lkotlin/Pair;");
+        s_overlay_control_data_portrait_position_field =
+                env->GetFieldID(overlay_control_data_class, "portraitPosition", "Lkotlin/Pair;");
+        s_overlay_control_data_foldable_position_field =
+                env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;");
+        s_overlay_control_data_individual_scale_field =
+                env->GetFieldID(overlay_control_data_class, "individualScale", "F");
+        env->DeleteLocalRef(overlay_control_data_class);
+
+        const jclass patch_class = env->FindClass("org/yuzu/yuzu_emu/model/Patch");
+        s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class));
+        s_patch_constructor = env->GetMethodID(
+                patch_class, "<init>",
+                "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JI)V");
+        s_patch_enabled_field = env->GetFieldID(patch_class, "enabled", "Z");
+        s_patch_name_field = env->GetFieldID(patch_class, "name", "Ljava/lang/String;");
+        s_patch_version_field = env->GetFieldID(patch_class, "version", "Ljava/lang/String;");
+        s_patch_type_field = env->GetFieldID(patch_class, "type", "I");
+        s_patch_program_id_field = env->GetFieldID(patch_class, "programId", "Ljava/lang/String;");
+        s_patch_title_id_field = env->GetFieldID(patch_class, "titleId", "Ljava/lang/String;");
+        env->DeleteLocalRef(patch_class);
+
+        const jclass double_class = env->FindClass("java/lang/Double");
+        s_double_class = reinterpret_cast<jclass>(env->NewGlobalRef(double_class));
+        s_double_constructor = env->GetMethodID(double_class, "<init>", "(D)V");
+        s_double_value_field = env->GetFieldID(double_class, "value", "D");
+        env->DeleteLocalRef(double_class);
+
+        const jclass int_class = env->FindClass("java/lang/Integer");
+        s_integer_class = reinterpret_cast<jclass>(env->NewGlobalRef(int_class));
+        s_integer_constructor = env->GetMethodID(int_class, "<init>", "(I)V");
+        s_integer_value_field = env->GetFieldID(int_class, "value", "I");
+        env->DeleteLocalRef(int_class);
+
+        const jclass boolean_class = env->FindClass("java/lang/Boolean");
+        s_boolean_class = reinterpret_cast<jclass>(env->NewGlobalRef(boolean_class));
+        s_boolean_constructor = env->GetMethodID(boolean_class, "<init>", "(Z)V");
+        s_boolean_value_field = env->GetFieldID(boolean_class, "value", "Z");
+        env->DeleteLocalRef(boolean_class);
+
+        const jclass player_input_class =
+                env->FindClass("org/yuzu/yuzu_emu/features/input/model/PlayerInput");
+        s_player_input_class = reinterpret_cast<jclass>(env->NewGlobalRef(player_input_class));
+        s_player_input_constructor = env->GetMethodID(
+                player_input_class, "<init>",
+                "(Z[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;ZIJJJJLjava/lang/String;Z)V");
+        s_player_input_connected_field = env->GetFieldID(player_input_class, "connected", "Z");
+        s_player_input_buttons_field =
+                env->GetFieldID(player_input_class, "buttons", "[Ljava/lang/String;");
+        s_player_input_analogs_field =
+                env->GetFieldID(player_input_class, "analogs", "[Ljava/lang/String;");
+        s_player_input_motions_field =
+                env->GetFieldID(player_input_class, "motions", "[Ljava/lang/String;");
+        s_player_input_vibration_enabled_field =
+                env->GetFieldID(player_input_class, "vibrationEnabled", "Z");
+        s_player_input_vibration_strength_field =
+                env->GetFieldID(player_input_class, "vibrationStrength", "I");
+        s_player_input_body_color_left_field =
+                env->GetFieldID(player_input_class, "bodyColorLeft", "J");
+        s_player_input_body_color_right_field =
+                env->GetFieldID(player_input_class, "bodyColorRight", "J");
+        s_player_input_button_color_left_field =
+                env->GetFieldID(player_input_class, "buttonColorLeft", "J");
+        s_player_input_button_color_right_field =
+                env->GetFieldID(player_input_class, "buttonColorRight", "J");
+        s_player_input_profile_name_field =
+                env->GetFieldID(player_input_class, "profileName", "Ljava/lang/String;");
+        s_player_input_use_system_vibrator_field =
+                env->GetFieldID(player_input_class, "useSystemVibrator", "Z");
+        env->DeleteLocalRef(player_input_class);
+
+        const jclass yuzu_input_device_interface =
+                env->FindClass("org/yuzu/yuzu_emu/features/input/YuzuInputDevice");
+        s_yuzu_input_device_interface =
+                reinterpret_cast<jclass>(env->NewGlobalRef(yuzu_input_device_interface));
+        s_yuzu_input_device_get_name =
+                env->GetMethodID(yuzu_input_device_interface, "getName", "()Ljava/lang/String;");
+        s_yuzu_input_device_get_guid =
+                env->GetMethodID(yuzu_input_device_interface, "getGUID", "()Ljava/lang/String;");
+        s_yuzu_input_device_get_port = env->GetMethodID(yuzu_input_device_interface, "getPort",
+                                                        "()I");
+        s_yuzu_input_device_get_supports_vibration =
+                env->GetMethodID(yuzu_input_device_interface, "getSupportsVibration", "()Z");
+        s_yuzu_input_device_vibrate = env->GetMethodID(yuzu_input_device_interface, "vibrate",
+                                                       "(F)V");
+        s_yuzu_input_device_get_axes =
+                env->GetMethodID(yuzu_input_device_interface, "getAxes", "()[Ljava/lang/Integer;");
+        s_yuzu_input_device_has_keys =
+                env->GetMethodID(yuzu_input_device_interface, "hasKeys", "([I)[Z");
+        env->DeleteLocalRef(yuzu_input_device_interface);
+        s_add_netplay_message = env->GetStaticMethodID(s_native_library_class, "addNetPlayMessage",
+                                                       "(ILjava/lang/String;)V");
+        s_clear_chat = env->GetStaticMethodID(s_native_library_class, "clearChat", "()V");
+
+
+        // Initialize Android Storage
+        Common::FS::Android::RegisterCallbacks(env, s_native_library_class);
+
+        // Initialize applets
+        Common::Android::SoftwareKeyboard::InitJNI(env);
+        Common::Android::WebBrowser::InitJNI(env);
+
+        return JNI_VERSION;
+    }
+
     void JNI_OnUnload(JavaVM *vm, void *reserved) {
         JNIEnv *env;
         if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION) != JNI_OK) {
@@ -462,183 +645,4 @@ namespace Common::Android {
     }
 #endif
 
-void Initialize(JavaVM* vm, JNIEnv *env) {
-    s_java_vm = vm;
-    InitFFmpegOnLoad(vm);
-
-    if (env->ExceptionCheck()) {
-        env->ExceptionClear();
-    }
-
-    // Initialize Java classes
-    const jclass native_library_class = env->FindClass("org/yuzu/yuzu_emu/NativeLibrary");
-    s_native_library_class = reinterpret_cast<jclass>(env->NewGlobalRef(native_library_class));
-    s_disk_cache_progress_class = reinterpret_cast<jclass>(env->NewGlobalRef(
-        env->FindClass("org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress")));
-    s_load_callback_stage_class = reinterpret_cast<jclass>(env->NewGlobalRef(env->FindClass(
-        "org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage")));
-
-    const jclass game_dir_class = env->FindClass("org/yuzu/yuzu_emu/model/GameDir");
-    s_game_dir_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_dir_class));
-    s_game_dir_constructor = env->GetMethodID(game_dir_class, "<init>",
-                                              "(Ljava/lang/String;Z)V");
-    env->DeleteLocalRef(game_dir_class);
-
-    // Initialize methods
-    s_exit_emulation_activity =
-        env->GetStaticMethodID(s_native_library_class, "exitEmulationActivity", "(I)V");
-    s_disk_cache_load_progress =
-        env->GetStaticMethodID(s_disk_cache_progress_class, "loadProgress", "(III)V");
-    s_copy_to_storage = env->GetStaticMethodID(s_native_library_class, "copyFileToStorage",
-                                               "(Ljava/lang/String;Ljava/lang/String;)Z");
-    s_file_exists = env->GetStaticMethodID(s_native_library_class, "exists",
-                                           "(Ljava/lang/String;)Z");
-    s_file_extension = env->GetStaticMethodID(s_native_library_class, "getFileExtension",
-                                              "(Ljava/lang/String;)Ljava/lang/String;");
-    s_on_emulation_started =
-        env->GetStaticMethodID(s_native_library_class, "onEmulationStarted", "()V");
-    s_on_emulation_stopped =
-        env->GetStaticMethodID(s_native_library_class, "onEmulationStopped", "(I)V");
-    s_on_program_changed =
-        env->GetStaticMethodID(s_native_library_class, "onProgramChanged", "(I)V");
-
-    const jclass game_class = env->FindClass("org/yuzu/yuzu_emu/model/Game");
-    s_game_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_class));
-    s_game_constructor = env->GetMethodID(game_class, "<init>",
-                                          "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/"
-                                          "String;Ljava/lang/String;Ljava/lang/String;Z)V");
-    s_game_title_field = env->GetFieldID(game_class, "title", "Ljava/lang/String;");
-    s_game_path_field = env->GetFieldID(game_class, "path", "Ljava/lang/String;");
-    s_game_program_id_field = env->GetFieldID(game_class, "programId", "Ljava/lang/String;");
-    s_game_developer_field = env->GetFieldID(game_class, "developer", "Ljava/lang/String;");
-    s_game_version_field = env->GetFieldID(game_class, "version", "Ljava/lang/String;");
-    s_game_is_homebrew_field = env->GetFieldID(game_class, "isHomebrew", "Z");
-    env->DeleteLocalRef(game_class);
-
-    const jclass string_class = env->FindClass("java/lang/String");
-    s_string_class = reinterpret_cast<jclass>(env->NewGlobalRef(string_class));
-    env->DeleteLocalRef(string_class);
-
-    const jclass pair_class = env->FindClass("kotlin/Pair");
-    s_pair_class = reinterpret_cast<jclass>(env->NewGlobalRef(pair_class));
-    s_pair_constructor =
-        env->GetMethodID(pair_class, "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
-    s_pair_first_field = env->GetFieldID(pair_class, "first", "Ljava/lang/Object;");
-    s_pair_second_field = env->GetFieldID(pair_class, "second", "Ljava/lang/Object;");
-    env->DeleteLocalRef(pair_class);
-
-    const jclass overlay_control_data_class =
-        env->FindClass("org/yuzu/yuzu_emu/overlay/model/OverlayControlData");
-    s_overlay_control_data_class =
-        reinterpret_cast<jclass>(env->NewGlobalRef(overlay_control_data_class));
-    s_overlay_control_data_constructor =
-        env->GetMethodID(overlay_control_data_class, "<init>",
-                         "(Ljava/lang/String;ZLkotlin/Pair;Lkotlin/Pair;Lkotlin/Pair;F)V");
-    s_overlay_control_data_id_field =
-        env->GetFieldID(overlay_control_data_class, "id", "Ljava/lang/String;");
-    s_overlay_control_data_enabled_field =
-        env->GetFieldID(overlay_control_data_class, "enabled", "Z");
-    s_overlay_control_data_landscape_position_field =
-        env->GetFieldID(overlay_control_data_class, "landscapePosition", "Lkotlin/Pair;");
-    s_overlay_control_data_portrait_position_field =
-        env->GetFieldID(overlay_control_data_class, "portraitPosition", "Lkotlin/Pair;");
-    s_overlay_control_data_foldable_position_field =
-        env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;");
-    s_overlay_control_data_individual_scale_field =
-        env->GetFieldID(overlay_control_data_class, "individualScale", "F");
-    env->DeleteLocalRef(overlay_control_data_class);
-
-    const jclass patch_class = env->FindClass("org/yuzu/yuzu_emu/model/Patch");
-    s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class));
-    s_patch_constructor = env->GetMethodID(
-        patch_class, "<init>",
-        "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JI)V");
-    s_patch_enabled_field = env->GetFieldID(patch_class, "enabled", "Z");
-    s_patch_name_field = env->GetFieldID(patch_class, "name", "Ljava/lang/String;");
-    s_patch_version_field = env->GetFieldID(patch_class, "version", "Ljava/lang/String;");
-    s_patch_type_field = env->GetFieldID(patch_class, "type", "I");
-    s_patch_program_id_field = env->GetFieldID(patch_class, "programId", "Ljava/lang/String;");
-    s_patch_title_id_field = env->GetFieldID(patch_class, "titleId", "Ljava/lang/String;");
-    env->DeleteLocalRef(patch_class);
-
-    const jclass double_class = env->FindClass("java/lang/Double");
-    s_double_class = reinterpret_cast<jclass>(env->NewGlobalRef(double_class));
-    s_double_constructor = env->GetMethodID(double_class, "<init>", "(D)V");
-    s_double_value_method = env->GetMethodID(double_class, "doubleValue", "()D");
-    env->DeleteLocalRef(double_class);
-
-    const jclass int_class = env->FindClass("java/lang/Integer");
-    s_integer_class = reinterpret_cast<jclass>(env->NewGlobalRef(int_class));
-    s_integer_constructor = env->GetMethodID(int_class, "<init>", "(I)V");
-    s_integer_value_method = env->GetMethodID(int_class, "intValue", "()I");
-    env->DeleteLocalRef(int_class);
-
-    const jclass boolean_class = env->FindClass("java/lang/Boolean");
-    s_boolean_class = reinterpret_cast<jclass>(env->NewGlobalRef(boolean_class));
-    s_boolean_constructor = env->GetMethodID(boolean_class, "<init>", "(Z)V");
-    s_boolean_value_method = env->GetMethodID(boolean_class, "booleanValue", "()Z");
-    env->DeleteLocalRef(boolean_class);
-
-    const jclass player_input_class =
-        env->FindClass("org/yuzu/yuzu_emu/features/input/model/PlayerInput");
-    s_player_input_class = reinterpret_cast<jclass>(env->NewGlobalRef(player_input_class));
-    s_player_input_constructor = env->GetMethodID(
-        player_input_class, "<init>",
-        "(Z[Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;ZIJJJJLjava/lang/String;Z)V");
-    s_player_input_connected_field = env->GetFieldID(player_input_class, "connected", "Z");
-    s_player_input_buttons_field =
-        env->GetFieldID(player_input_class, "buttons", "[Ljava/lang/String;");
-    s_player_input_analogs_field =
-        env->GetFieldID(player_input_class, "analogs", "[Ljava/lang/String;");
-    s_player_input_motions_field =
-        env->GetFieldID(player_input_class, "motions", "[Ljava/lang/String;");
-    s_player_input_vibration_enabled_field =
-        env->GetFieldID(player_input_class, "vibrationEnabled", "Z");
-    s_player_input_vibration_strength_field =
-        env->GetFieldID(player_input_class, "vibrationStrength", "I");
-    s_player_input_body_color_left_field =
-        env->GetFieldID(player_input_class, "bodyColorLeft", "J");
-    s_player_input_body_color_right_field =
-        env->GetFieldID(player_input_class, "bodyColorRight", "J");
-    s_player_input_button_color_left_field =
-        env->GetFieldID(player_input_class, "buttonColorLeft", "J");
-    s_player_input_button_color_right_field =
-        env->GetFieldID(player_input_class, "buttonColorRight", "J");
-    s_player_input_profile_name_field =
-        env->GetFieldID(player_input_class, "profileName", "Ljava/lang/String;");
-    s_player_input_use_system_vibrator_field =
-        env->GetFieldID(player_input_class, "useSystemVibrator", "Z");
-    env->DeleteLocalRef(player_input_class);
-
-    const jclass yuzu_input_device_interface =
-        env->FindClass("org/yuzu/yuzu_emu/features/input/YuzuInputDevice");
-    s_yuzu_input_device_interface =
-        reinterpret_cast<jclass>(env->NewGlobalRef(yuzu_input_device_interface));
-    s_yuzu_input_device_get_name =
-        env->GetMethodID(yuzu_input_device_interface, "getName", "()Ljava/lang/String;");
-    s_yuzu_input_device_get_guid =
-        env->GetMethodID(yuzu_input_device_interface, "getGUID", "()Ljava/lang/String;");
-    s_yuzu_input_device_get_port = env->GetMethodID(yuzu_input_device_interface, "getPort",
-                                                    "()I");
-    s_yuzu_input_device_get_supports_vibration =
-        env->GetMethodID(yuzu_input_device_interface, "getSupportsVibration", "()Z");
-    s_yuzu_input_device_vibrate = env->GetMethodID(yuzu_input_device_interface, "vibrate",
-                                                   "(F)V");
-    s_yuzu_input_device_get_axes =
-        env->GetMethodID(yuzu_input_device_interface, "getAxes", "()[Ljava/lang/Integer;");
-    s_yuzu_input_device_has_keys =
-        env->GetMethodID(yuzu_input_device_interface, "hasKeys", "([I)[Z");
-    env->DeleteLocalRef(yuzu_input_device_interface);
-    s_add_netplay_message = env->GetStaticMethodID(s_native_library_class, "addNetPlayMessage",
-                                                   "(ILjava/lang/String;)V");
-    s_clear_chat = env->GetStaticMethodID(s_native_library_class, "clearChat", "()V");
-
-    // Initialize Android Storage
-    Common::FS::Android::RegisterCallbacks(env, s_native_library_class);
-
-    // Initialize applets
-    Common::Android::SoftwareKeyboard::InitJNI(env);
-    Common::Android::WebBrowser::InitJNI(env);
-}
-
 } // namespace Common::Android

src/common/android/id_cache.h

@@ -11,7 +11,6 @@
 
 namespace Common::Android {
 
-void Initialize(JavaVM* vm, JNIEnv *env);
 JNIEnv* GetEnvForThread();
 
 /**
@@ -81,15 +80,15 @@ jfieldID GetPatchTitleIdField();
 
 jclass GetDoubleClass();
 jmethodID GetDoubleConstructor();
-jmethodID GetDoubleValueMethod();
+jfieldID GetDoubleValueField();
 
 jclass GetIntegerClass();
 jmethodID GetIntegerConstructor();
-jmethodID GetIntegerValueMethod();
+jfieldID GetIntegerValueField();
 
 jclass GetBooleanClass();
 jmethodID GetBooleanConstructor();
-jmethodID GetBooleanValueMethod();
+jfieldID GetBooleanValueField();
 
 jclass GetPlayerInputClass();
 jmethodID GetPlayerInputConstructor();

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/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/settings_enums.h

@@ -92,14 +92,14 @@ struct EnumMetadata {
 // AudioEngine must be specified discretely due to having existing but slightly different
 // canonicalizations
 // TODO (lat9nq): Remove explicit definition of AudioEngine/sink_id
-enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, };
+enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, Oboe, };
 template<>
 inline std::vector<std::pair<std::string_view, AudioEngine>> EnumMetadata<AudioEngine>::Canonicalizations() {
     return {
         {"auto", AudioEngine::Auto},
         {"cubeb", AudioEngine::Cubeb},
         {"sdl3", AudioEngine::Sdl3},
-        {"null", AudioEngine::Null},
+        {"null", AudioEngine::Null}, {"oboe", AudioEngine::Oboe},
     };
 }
 /// @brief This is just a sufficiently large number that is more than the number of other enums declared here
@@ -113,7 +113,7 @@ inline AudioEngine EnumMetadata<AudioEngine>::GetFirst() {
 }
 template<>
 inline AudioEngine EnumMetadata<AudioEngine>::GetLast() {
-    return AudioEngine::Null;
+    return AudioEngine::Oboe;
 }
 
 ENUM(AudioMode, Mono, Stereo, Surround);

src/common/uuid.h

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

src/core/arm/nce/arm_nce.cpp

@@ -160,16 +160,26 @@ bool ArmNce::HandleGuestAlignmentFault(GuestContext* guest_ctx, void* raw_info,
 bool ArmNce::HandleGuestAccessFault(GuestContext* guest_ctx, void* raw_info, void* raw_context) {
     auto* info = static_cast<siginfo_t*>(raw_info);
 
-    // Try to handle an invalid access.
-    // TODO: handle accesses which split a page?
-    const Common::ProcessAddress addr =
-        (reinterpret_cast<u64>(info->si_addr) & ~Memory::YUZU_PAGEMASK);
     auto& memory = guest_ctx->parent->m_running_thread->GetOwnerProcess()->GetMemory();
-    if (memory.InvalidateNCE(addr, Memory::YUZU_PAGESIZE)) {
-        // We handled the access successfully and are returning to guest code.
-        return true;
-    }
 
+    // Try to handle an invalid access.
+    auto const acc_size = 16; // Max architectural access size
+    // Please note accesses can be wider than 16-bytes
+    // This should handle **most** of the fragant issues with cases like 128-bit vector
+    // ld/st or GPU writes.
+    // This computes the addr for the (first) page corresponding to the access (if not crossing)
+    auto const addr_c1 = Common::ProcessAddress(u64(info->si_addr) & ~Memory::YUZU_PAGEMASK);
+    if (!(acc_size > 1 && (addr_c1 & Memory::YUZU_PAGEMASK) + acc_size > Memory::YUZU_PAGESIZE)) {
+        if (memory.InvalidateNCE(addr_c1, Memory::YUZU_PAGESIZE))
+            return true;
+    } else {
+        // Corresponds to the 2nd page, this means the access is split between two pages
+        auto const addr_c2 = (addr_c1 & ~Memory::YUZU_PAGEMASK) + Memory::YUZU_PAGESIZE;
+        // Always invalidate 2nd page, but only account if 1st page was invalidated properly
+        memory.InvalidateNCE(addr_c2, Memory::YUZU_PAGESIZE);
+        if (memory.InvalidateNCE(addr_c1, Memory::YUZU_PAGESIZE))
+            return true;
+    }
     // We couldn't handle the access.
     return HandleFailedGuestFault(guest_ctx, raw_info, raw_context);
 }

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
@@ -358,7 +358,7 @@ private:
 
         ConnectionState(boost::asio::ip::tcp::socket&& client_socket_, async_pipe signal_pipe_, Kernel::KernelCore& kernel)
             : client_socket{std::move(client_socket_)}
-            , signal_pipe{std::move(signal_pipe_)}
+            , signal_pipe{signal_pipe_}
             , active_thread{kernel, nullptr}
         {}
 

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/kernel/k_process.cpp

@@ -1021,9 +1021,6 @@ Result KProcess::Run(KernelCore& kernel, s32 priority, size_t stack_size) {
 
     // Suspend for debug, if we should.
     if (kernel.System().DebuggerEnabled()) {
-        LOG_INFO(Debug_GDBStub,
-                 "GDB stub enabled; suspending guest process until a debugger continues execution on port {}",
-                 Settings::values.gdbstub_port.GetValue());
         main_thread->RequestSuspend(kernel, SuspendType::Debug);
     }
 

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 = {
-    out_image_output.width = 1280;
+        .width = 1280,
-    out_image_output.height = 720;
+        .height = 720,
-    out_image_output.attribute.orientation = AlbumImageOrientation::None;
+        .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 = {
-    out_image_output.width = 320;
+        .width = 320,
-    out_image_output.height = 180;
+        .height = 180,
-    out_image_output.attribute.orientation = AlbumImageOrientation::None;
+        .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{};
+    const Capture::ScreenShotAttribute attribute{
-    attribute.orientation = Capture::AlbumImageOrientation::None;
+        .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/input_common/drivers/android.cpp

@@ -114,7 +114,7 @@ std::set<s32> Android::GetDeviceAxes(JNIEnv* env, jobject& j_device) const {
     std::set<s32> axes;
     for (int i = 0; i < env->GetArrayLength(j_axes); ++i) {
         jobject axis = env->GetObjectArrayElement(j_axes, i);
-        axes.insert(env->CallIntMethod(axis, Common::Android::GetIntegerValueMethod()));
+        axes.insert(env->GetIntField(axis, Common::Android::GetIntegerValueField()));
     }
     return axes;
 }

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/CMakeLists.txt

@@ -20,7 +20,6 @@ add_library(video_core STATIC
     buffer_cache/buffer_cache.h
     buffer_cache/memory_tracker_base.h
     buffer_cache/usage_tracker.h
-    buffer_cache/virtual_range_cache.h
     buffer_cache/word_manager.h
     cache_types.h
     capture.h
@@ -167,8 +166,6 @@ add_library(video_core STATIC
     renderer_vulkan/vk_fence_manager.h
     renderer_vulkan/vk_graphics_pipeline.cpp
     renderer_vulkan/vk_graphics_pipeline.h
-    renderer_vulkan/vk_multi_range_buffer.cpp
-    renderer_vulkan/vk_multi_range_buffer.h
     renderer_vulkan/vk_master_semaphore.cpp
     renderer_vulkan/vk_master_semaphore.h
     renderer_vulkan/vk_pipeline_cache.cpp

src/video_core/buffer_cache/buffer_cache.h

@@ -112,13 +112,6 @@ void BufferCache<P>::TickFrame() {
     async_buffers_death_ring.clear();
 }
 
-template <class P>
-void BufferCache<P>::UnmapGPUMemory(size_t as_id, GPUVAddr gpu_addr, size_t size) {
-    if constexpr (requires { runtime.BindMultiRangeStorageBuffer(u64{}, bool{}); }) {
-        virtual_ranges.Unmap(as_id, gpu_addr, size);
-    }
-}
-
 template <class P>
 void BufferCache<P>::WriteMemory(DAddr device_addr, u64 size) {
     if (memory_tracker.IsRegionGpuModified(device_addr, size)) {
@@ -215,8 +208,8 @@ bool BufferCache<P>::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am
     BufferId buffer_b;
     do {
         channel_state->has_deleted_buffers = false;
-        buffer_a = FindBuffer(*cpu_src_address, static_cast<u32>(amount), false);
+        buffer_a = FindBuffer(*cpu_src_address, static_cast<u32>(amount));
-        buffer_b = FindBuffer(*cpu_dest_address, static_cast<u32>(amount), false);
+        buffer_b = FindBuffer(*cpu_dest_address, static_cast<u32>(amount));
     } while (channel_state->has_deleted_buffers);
     auto& src_buffer = slot_buffers[buffer_a];
     auto& dest_buffer = slot_buffers[buffer_b];
@@ -272,7 +265,7 @@ bool BufferCache<P>::DMAClear(GPUVAddr dst_address, u64 amount, u32 value) {
     ClearDownload(*cpu_dst_address, size);
     gpu_modified_ranges.Subtract(*cpu_dst_address, size);
 
-    const BufferId buffer = FindBuffer(*cpu_dst_address, static_cast<u32>(size), false);
+    const BufferId buffer = FindBuffer(*cpu_dst_address, static_cast<u32>(size));
     Buffer& dest_buffer = slot_buffers[buffer];
     const u32 offset = dest_buffer.Offset(*cpu_dst_address);
     runtime.ClearBuffer(dest_buffer, offset, size, value);
@@ -294,7 +287,7 @@ std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainBuffer(GPUVAddr gpu_ad
 template <class P>
 std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainCPUBuffer(
     DAddr device_addr, u32 size, ObtainBufferSynchronize sync_info, ObtainBufferOperation post_op) {
-    const BufferId buffer_id = FindBuffer(device_addr, size, false);
+    const BufferId buffer_id = FindBuffer(device_addr, size);
     Buffer& buffer = slot_buffers[buffer_id];
 
     // synchronize op
@@ -1005,85 +998,11 @@ void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32
     channel_state->fast_bound_uniform_buffers[stage] &= ~(1u << binding_index);
 }
 
-template <class P>
-void BufferCache<P>::ResolveMultiRangeStorage(Binding& binding, bool is_written,
-                                              std::vector<MultiRangeSegment>& pool) {
-    binding.segment_first = 0;
-    binding.segment_count = 0;
-    if constexpr (requires { runtime.BindMultiRangeStorageBuffer(u64{}, bool{}); }) {
-        if (binding.gpu_addr == 0 || binding.size == 0) {
-            return;
-        }
-        if (is_written && !runtime.PrefersSparseSources()) {
-            return;
-        }
-        const VirtualSegments* found =
-            virtual_ranges.Query(*gpu_memory, binding.gpu_addr, binding.size);
-        if (!found || found->size() < 2) {
-            return;
-        }
-        const VirtualSegments segments = *found;
-        const u32 first = static_cast<u32>(pool.size());
-        const bool prefer_sparse = runtime.PrefersSparseSources();
-        for (const VirtualSegment& segment : segments) {
-            const BufferId buffer_id =
-                FindBuffer(segment.device_addr, segment.size, prefer_sparse);
-            if (!buffer_id) {
-                pool.resize(first);
-                return;
-            }
-            pool.push_back(MultiRangeSegment{
-                .buffer_id = buffer_id,
-                .device_addr = segment.device_addr,
-                .size = segment.size,
-            });
-        }
-        binding.segment_first = first;
-        binding.segment_count = static_cast<u32>(segments.size());
-    }
-}
-
-template <class P>
-bool BufferCache<P>::BindMultiRangeStorage(const Binding& binding, bool is_written,
-                                           std::span<const MultiRangeSegment> pool) {
-    if constexpr (requires { runtime.BindMultiRangeStorageBuffer(u64{}, bool{}); }) {
-        if (binding.segment_count < 2) {
-            return false;
-        }
-        if (binding.segment_first + binding.segment_count > pool.size()) {
-            return false;
-        }
-        const u64 key = (static_cast<u64>(gpu_memory->GetID()) << 48) ^ binding.gpu_addr;
-        runtime.ResetMultiRange();
-        for (u32 index = 0; index < binding.segment_count; ++index) {
-            const MultiRangeSegment& segment = pool[binding.segment_first + index];
-            Buffer& buffer = slot_buffers[segment.buffer_id];
-            TouchBuffer(buffer, segment.buffer_id);
-            if (SynchronizeBuffer(buffer, segment.device_addr, segment.size)) {
-                runtime.InvalidateMultiRange(key);
-            }
-            const u32 offset = buffer.Offset(segment.device_addr);
-            buffer.MarkUsage(offset, segment.size);
-            if (is_written) {
-                MarkWrittenBuffer(segment.buffer_id, segment.device_addr, segment.size);
-            }
-            runtime.PushMultiRangeSource(buffer, offset, segment.size);
-        }
-        return runtime.BindMultiRangeStorageBuffer(key, is_written);
-    } else {
-        return false;
-    }
-}
-
 template <class P>
 void BufferCache<P>::BindHostGraphicsStorageBuffers(size_t stage) {
     u32 binding_index = 0;
     ForEachEnabledBit(channel_state->enabled_storage_buffers[stage], [&](u32 index) {
         const Binding& binding = channel_state->storage_buffers[stage][index];
-        const bool is_written = ((channel_state->written_storage_buffers[stage] >> index) & 1) != 0;
-        if (BindMultiRangeStorage(binding, is_written, graphics_segments)) {
-            return;
-        }
         Buffer& buffer = slot_buffers[binding.buffer_id];
         TouchBuffer(buffer, binding.buffer_id);
         const u32 size = binding.size;
@@ -1091,6 +1010,7 @@ void BufferCache<P>::BindHostGraphicsStorageBuffers(size_t stage) {
 
         const u32 offset = buffer.Offset(binding.device_addr);
         buffer.MarkUsage(offset, size);
+        const bool is_written = ((channel_state->written_storage_buffers[stage] >> index) & 1) != 0;
 
         if (is_written) {
             MarkWrittenBuffer(binding.buffer_id, binding.device_addr, size);
@@ -1219,11 +1139,6 @@ void BufferCache<P>::BindHostComputeStorageBuffers() {
     u32 binding_index = 0;
     ForEachEnabledBit(channel_state->enabled_compute_storage_buffers, [&](u32 index) {
         const Binding& binding = channel_state->compute_storage_buffers[index];
-        const bool is_written =
-            ((channel_state->written_compute_storage_buffers >> index) & 1) != 0;
-        if (BindMultiRangeStorage(binding, is_written, compute_segments)) {
-            return;
-        }
         Buffer& buffer = slot_buffers[binding.buffer_id];
         TouchBuffer(buffer, binding.buffer_id);
         const u32 size = binding.size;
@@ -1231,6 +1146,8 @@ void BufferCache<P>::BindHostComputeStorageBuffers() {
 
         const u32 offset = buffer.Offset(binding.device_addr);
         buffer.MarkUsage(offset, size);
+        const bool is_written =
+            ((channel_state->written_compute_storage_buffers >> index) & 1) != 0;
 
         if (is_written) {
             MarkWrittenBuffer(binding.buffer_id, binding.device_addr, size);
@@ -1276,7 +1193,6 @@ void BufferCache<P>::BindHostComputeTextureBuffers() {
 
 template <class P>
 void BufferCache<P>::DoUpdateGraphicsBuffers(bool is_indexed) {
-    graphics_segments.clear();
     BufferOperations([&]() {
         if (is_indexed) {
             UpdateIndexBuffer();
@@ -1296,7 +1212,6 @@ void BufferCache<P>::DoUpdateGraphicsBuffers(bool is_indexed) {
 
 template <class P>
 void BufferCache<P>::DoUpdateComputeBuffers() {
-    compute_segments.clear();
     BufferOperations([&]() {
         UpdateComputeUniformBuffers();
         UpdateComputeStorageBuffers();
@@ -1319,11 +1234,11 @@ void BufferCache<P>::UpdateIndexBuffer() {
         auto inline_index_size = static_cast<u32>(draw_state.inline_index_draw_indexes.size());
         u32 buffer_size = Common::AlignUp(inline_index_size, CACHING_PAGESIZE);
         if (inline_buffer_id == NULL_BUFFER_ID) [[unlikely]] {
-            inline_buffer_id = CreateBuffer(0, buffer_size, false);
+            inline_buffer_id = CreateBuffer(0, buffer_size);
         }
         if (slot_buffers[inline_buffer_id].SizeBytes() < buffer_size) [[unlikely]] {
             slot_buffers.erase(inline_buffer_id);
-            inline_buffer_id = CreateBuffer(0, buffer_size, false);
+            inline_buffer_id = CreateBuffer(0, buffer_size);
         }
         channel_state->index_buffer = Binding{
             .device_addr = 0,
@@ -1346,7 +1261,7 @@ void BufferCache<P>::UpdateIndexBuffer() {
     channel_state->index_buffer = Binding{
         .device_addr = *device_addr,
         .size = size,
-        .buffer_id = FindBuffer(*device_addr, size, false),
+        .buffer_id = FindBuffer(*device_addr, size),
     };
 }
 
@@ -1383,7 +1298,7 @@ void BufferCache<P>::UpdateVertexBuffer(u32 index) {
     if (!gpu_memory->IsWithinGPUAddressRange(gpu_addr_end) || size >= 64_MiB) {
         size = static_cast<u32>(gpu_memory->MaxContinuousRange(gpu_addr_begin, size));
     }
-    const BufferId buffer_id = FindBuffer(*device_addr, size, false);
+    const BufferId buffer_id = FindBuffer(*device_addr, size);
     const Binding binding{
         .device_addr = *device_addr,
         .size = size,
@@ -1404,7 +1319,7 @@ void BufferCache<P>::UpdateDrawIndirect() {
         binding = Binding{
             .device_addr = *device_addr,
             .size = static_cast<u32>(size),
-            .buffer_id = FindBuffer(*device_addr, static_cast<u32>(size), false),
+            .buffer_id = FindBuffer(*device_addr, static_cast<u32>(size)),
         };
     };
     if (current_draw_indirect->include_count) {
@@ -1428,7 +1343,7 @@ void BufferCache<P>::UpdateUniformBuffers(size_t stage) {
             channel_state->dirty_uniform_buffers[stage] |= 1U << index;
         }
         // Resolve buffer
-        binding.buffer_id = FindBuffer(binding.device_addr, binding.size, false);
+        binding.buffer_id = FindBuffer(binding.device_addr, binding.size);
     });
 }
 
@@ -1437,10 +1352,8 @@ void BufferCache<P>::UpdateStorageBuffers(size_t stage) {
     ForEachEnabledBit(channel_state->enabled_storage_buffers[stage], [&](u32 index) {
         // Resolve buffer
         Binding& binding = channel_state->storage_buffers[stage][index];
-        const BufferId buffer_id = FindBuffer(binding.device_addr, binding.size, false);
+        const BufferId buffer_id = FindBuffer(binding.device_addr, binding.size);
         binding.buffer_id = buffer_id;
-        const bool is_written = ((channel_state->written_storage_buffers[stage] >> index) & 1) != 0;
-        ResolveMultiRangeStorage(binding, is_written, graphics_segments);
     });
 }
 
@@ -1448,7 +1361,7 @@ template <class P>
 void BufferCache<P>::UpdateTextureBuffers(size_t stage) {
     ForEachEnabledBit(channel_state->enabled_texture_buffers[stage], [&](u32 index) {
         Binding& binding = channel_state->texture_buffers[stage][index];
-        binding.buffer_id = FindBuffer(binding.device_addr, binding.size, false);
+        binding.buffer_id = FindBuffer(binding.device_addr, binding.size);
     });
 }
 
@@ -1472,7 +1385,7 @@ void BufferCache<P>::UpdateTransformFeedbackBuffer(u32 index) {
         channel_state->transform_feedback_buffers[index] = NULL_BINDING;
         return;
     }
-    const BufferId buffer_id = FindBuffer(*device_addr, size, false);
+    const BufferId buffer_id = FindBuffer(*device_addr, size);
     channel_state->transform_feedback_buffers[index] = Binding{
         .device_addr = *device_addr,
         .size = size,
@@ -1494,7 +1407,7 @@ void BufferCache<P>::UpdateComputeUniformBuffers() {
                 binding.size = cbuf.size;
             }
         }
-        binding.buffer_id = FindBuffer(binding.device_addr, binding.size, false);
+        binding.buffer_id = FindBuffer(binding.device_addr, binding.size);
     });
 }
 
@@ -1503,10 +1416,7 @@ void BufferCache<P>::UpdateComputeStorageBuffers() {
     ForEachEnabledBit(channel_state->enabled_compute_storage_buffers, [&](u32 index) {
         // Resolve buffer
         Binding& binding = channel_state->compute_storage_buffers[index];
-        binding.buffer_id = FindBuffer(binding.device_addr, binding.size, false);
+        binding.buffer_id = FindBuffer(binding.device_addr, binding.size);
-        const bool is_written =
-            ((channel_state->written_compute_storage_buffers >> index) & 1) != 0;
-        ResolveMultiRangeStorage(binding, is_written, compute_segments);
     });
 }
 
@@ -1514,7 +1424,7 @@ template <class P>
 void BufferCache<P>::UpdateComputeTextureBuffers() {
     ForEachEnabledBit(channel_state->enabled_compute_texture_buffers, [&](u32 index) {
         Binding& binding = channel_state->compute_texture_buffers[index];
-        binding.buffer_id = FindBuffer(binding.device_addr, binding.size, false);
+        binding.buffer_id = FindBuffer(binding.device_addr, binding.size);
     });
 }
 
@@ -1530,7 +1440,7 @@ void BufferCache<P>::MarkWrittenBuffer(BufferId buffer_id, DAddr device_addr, u3
 }
 
 template <class P>
-BufferId BufferCache<P>::FindBuffer(DAddr device_addr, u32 size, bool sparse_compatible) {
+BufferId BufferCache<P>::FindBuffer(DAddr device_addr, u32 size) {
     if (device_addr == 0) {
         return NULL_BUFFER_ID;
     }
@@ -1540,18 +1450,10 @@ BufferId BufferCache<P>::FindBuffer(DAddr device_addr, u32 size, bool sparse_com
         Buffer& buffer = slot_buffers[buffer_id];
         WaitForGpuFenceIfNeeded(buffer);
         if (buffer.IsInBounds(device_addr, size)) {
-            bool usable = true;
+            return buffer_id;
-            if constexpr (requires { buffer.IsSparseCompatible(); }) {
-                if (sparse_compatible && !buffer.IsSparseCompatible()) {
-                    usable = false;
-                }
-            }
-            if (usable) {
-                return buffer_id;
-            }
         }
     }
-    return CreateBuffer(device_addr, size, sparse_compatible);
+    return CreateBuffer(device_addr, size);
 }
 
 template <class P>
@@ -1673,15 +1575,13 @@ void BufferCache<P>::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id,
 }
 
 template <class P>
-BufferId BufferCache<P>::CreateBuffer(DAddr device_addr, u32 wanted_size,
+BufferId BufferCache<P>::CreateBuffer(DAddr device_addr, u32 wanted_size) {
-                                      bool sparse_compatible) {
     DAddr device_addr_end = Common::AlignUp(device_addr + wanted_size, CACHING_PAGESIZE);
     device_addr = Common::AlignDown(device_addr, CACHING_PAGESIZE);
     wanted_size = static_cast<u32>(device_addr_end - device_addr);
     const OverlapResult overlap = ResolveOverlaps(device_addr, wanted_size);
     const u32 size = static_cast<u32>(overlap.end - overlap.begin);
-    const BufferId new_buffer_id =
+    const BufferId new_buffer_id = slot_buffers.insert(runtime, overlap.begin, size);
-        slot_buffers.insert(runtime, overlap.begin, size, sparse_compatible);
     auto& new_buffer = slot_buffers[new_buffer_id];
     const size_t size_bytes = new_buffer.SizeBytes();
     runtime.ClearBuffer(new_buffer, 0, size_bytes, 0);
@@ -1845,7 +1745,7 @@ void BufferCache<P>::InlineMemoryImplementation(DAddr dest_address, size_t copy_
     ClearDownload(dest_address, copy_size);
     gpu_modified_ranges.Subtract(dest_address, copy_size);
 
-    BufferId buffer_id = FindBuffer(dest_address, static_cast<u32>(copy_size), false);
+    BufferId buffer_id = FindBuffer(dest_address, static_cast<u32>(copy_size));
     auto& buffer = slot_buffers[buffer_id];
     SynchronizeBuffer(buffer, dest_address, static_cast<u32>(copy_size));
 
@@ -1931,9 +1831,6 @@ void BufferCache<P>::DownloadBufferMemory(Buffer& buffer, DAddr device_addr, u64
 
 template <class P>
 void BufferCache<P>::DeleteBuffer(BufferId buffer_id, bool do_not_mark) {
-    if constexpr (requires { runtime.OnBufferDeleted(slot_buffers[buffer_id]); }) {
-        runtime.OnBufferDeleted(slot_buffers[buffer_id]);
-    }
     bool dirty_index{false};
     boost::container::small_vector<u64, NUM_VERTEX_BUFFERS> dirty_vertex_buffers;
     const auto scalar_replace = [buffer_id](Binding& binding) {
@@ -2037,14 +1934,9 @@ Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
     // The end address used for size calculation does not need to be aligned
     const DAddr cpu_end = Common::AlignUp(*device_addr + size, Core::DEVICE_PAGESIZE);
 
-    u32 binding_size = static_cast<u32>(cpu_end - *aligned_device_addr);
-    if (is_written) {
-        binding_size = aligned_size;
-    }
     const Binding binding{
         .device_addr = *aligned_device_addr,
-        .gpu_addr = aligned_gpu_addr,
+        .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *aligned_device_addr),
-        .size = binding_size,
         .buffer_id = BufferId{},
     };
     return binding;

src/video_core/buffer_cache/buffer_cache_base.h

@@ -29,7 +29,6 @@
 #include "common/settings.h"
 #include "common/slot_vector.h"
 #include "video_core/buffer_cache/buffer_base.h"
-#include "video_core/buffer_cache/virtual_range_cache.h"
 #include "video_core/control/channel_state_cache.h"
 #include "video_core/delayed_destruction_ring.h"
 #include "video_core/dirty_flags.h"
@@ -82,17 +81,8 @@ static constexpr u32 DEFAULT_SKIP_CACHE_SIZE = static_cast<u32>(4_KiB);
 
 struct Binding {
     DAddr device_addr{};
-    GPUVAddr gpu_addr{};
     u32 size{};
     BufferId buffer_id;
-    u32 segment_first{};
-    u32 segment_count{};
-};
-
-struct MultiRangeSegment {
-    BufferId buffer_id;
-    DAddr device_addr{};
-    u32 size{};
 };
 
 struct TextureBufferBinding : Binding {
@@ -225,14 +215,6 @@ public:
 
     void TickFrame();
 
-    bool BindMultiRangeStorage(const Binding& binding, bool is_written,
-                               std::span<const MultiRangeSegment> pool);
-
-    void ResolveMultiRangeStorage(Binding& binding, bool is_written,
-                                  std::vector<MultiRangeSegment>& pool);
-
-    void UnmapGPUMemory(size_t as_id, GPUVAddr gpu_addr, size_t size);
-
     void WriteMemory(DAddr device_addr, u64 size);
 
     void CachedWriteMemory(DAddr device_addr, u64 size);
@@ -432,7 +414,7 @@ private:
 
     void MarkWrittenBuffer(BufferId buffer_id, DAddr device_addr, u32 size);
 
-    [[nodiscard]] BufferId FindBuffer(DAddr device_addr, u32 size, bool sparse_compatible);
+    [[nodiscard]] BufferId FindBuffer(DAddr device_addr, u32 size);
 
     void WaitForGpuFenceIfNeeded(Buffer& buffer);
 
@@ -440,8 +422,7 @@ private:
 
     void JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, bool accumulate_stream_score);
 
-    [[nodiscard]] BufferId CreateBuffer(DAddr device_addr, u32 wanted_size,
+    [[nodiscard]] BufferId CreateBuffer(DAddr device_addr, u32 wanted_size);
-                                        bool sparse_compatible);
 
     void Register(BufferId buffer_id);
 
@@ -532,9 +513,6 @@ private:
         using TickType = u64;
     };
     Common::LeastRecentlyUsedCache<LRUItemParams> lru_cache;
-    VirtualRangeCache virtual_ranges;
-    std::vector<MultiRangeSegment> graphics_segments;
-    std::vector<MultiRangeSegment> compute_segments;
     u64 frame_tick = 0;
     u64 total_used_memory = 0;
     u64 minimum_memory = 0;

src/video_core/buffer_cache/virtual_range_cache.h

@@ -1,173 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <atomic>
-#include <limits>
-#include <mutex>
-#include <optional>
-#include <vector>
-
-#include <boost/container/small_vector.hpp>
-
-#include "common/common_types.h"
-#include "common/container/unordered_map.h"
-#include "video_core/memory_manager.h"
-
-namespace VideoCommon {
-
-struct VirtualSegment {
-    GPUVAddr gpu_addr;
-    DAddr device_addr;
-    u32 size;
-};
-
-using VirtualSegments = boost::container::small_vector<VirtualSegment, 8>;
-
-class VirtualRangeCache {
-public:
-    static constexpr size_t MAX_ENTRIES = 8192;
-    static constexpr size_t MAX_DEFERRED = 4096;
-
-    const VirtualSegments* Query(Tegra::MemoryManager& memory, GPUVAddr gpu_addr, u32 size) {
-        if (has_deferred.load(std::memory_order_acquire)) {
-            ApplyDeferred();
-        }
-        if (entries.size() > MAX_ENTRIES) {
-            entries.clear();
-        }
-        const size_t as_id = memory.GetID();
-        const u64 key = MakeKey(as_id, gpu_addr);
-        const auto it = entries.find(key);
-        if (it != entries.end() && it->second.as_id == as_id &&
-            it->second.gpu_addr == gpu_addr && it->second.size == size) {
-            return &it->second.segments;
-        }
-        Entry entry{};
-        entry.as_id = as_id;
-        entry.gpu_addr = gpu_addr;
-        entry.size = size;
-        const auto ranges = memory.GetSubmappedRange(gpu_addr, size);
-        GPUVAddr expected = gpu_addr;
-        bool contiguous = true;
-        for (const auto& [range_addr, range_size] : ranges) {
-            if (range_addr != expected || range_size == 0) {
-                contiguous = false;
-                break;
-            }
-            const std::optional<DAddr> device_addr = memory.GpuToCpuAddress(range_addr);
-            if (!device_addr || *device_addr == 0) {
-                contiguous = false;
-                break;
-            }
-            if (range_size > static_cast<size_t>((std::numeric_limits<u32>::max)())) {
-                contiguous = false;
-                break;
-            }
-            entry.segments.push_back(VirtualSegment{
-                .gpu_addr = range_addr,
-                .device_addr = *device_addr,
-                .size = static_cast<u32>(range_size),
-            });
-            expected += range_size;
-        }
-        if (!contiguous || expected != gpu_addr + size) {
-            entry.segments.clear();
-        }
-        const auto result = entries.insert_or_assign(key, std::move(entry));
-        return &result.first->second.segments;
-    }
-
-    void Unmap(size_t as_id, GPUVAddr gpu_addr, u64 size) {
-        if (size == 0) {
-            return;
-        }
-        {
-            std::scoped_lock lock{deferred_mutex};
-            if (!deferred.empty()) {
-                DeferredUnmap& last = deferred.back();
-                if (last.as_id == as_id && last.gpu_addr + last.size == gpu_addr) {
-                    last.size += size;
-                    has_deferred.store(true, std::memory_order_release);
-                    return;
-                }
-            }
-            if (deferred.size() >= MAX_DEFERRED) {
-                deferred.clear();
-                deferred_overflow = true;
-            } else {
-                deferred.push_back(DeferredUnmap{
-                    .as_id = as_id,
-                    .gpu_addr = gpu_addr,
-                    .size = size,
-                });
-            }
-        }
-        has_deferred.store(true, std::memory_order_release);
-    }
-
-private:
-    struct Entry {
-        VirtualSegments segments;
-        size_t as_id{};
-        GPUVAddr gpu_addr{};
-        u32 size{};
-    };
-
-    struct DeferredUnmap {
-        size_t as_id;
-        GPUVAddr gpu_addr;
-        u64 size;
-    };
-
-    static u64 MakeKey(size_t as_id, GPUVAddr gpu_addr) {
-        return (static_cast<u64>(as_id) << 48) ^ gpu_addr;
-    }
-
-    void ApplyDeferred() {
-        std::vector<DeferredUnmap> pending;
-        bool overflow = false;
-        {
-            std::scoped_lock lock{deferred_mutex};
-            has_deferred.store(false, std::memory_order_release);
-            pending.swap(deferred);
-            overflow = deferred_overflow;
-            deferred_overflow = false;
-        }
-        if (overflow) {
-            entries.clear();
-            return;
-        }
-        if (pending.empty() || entries.empty()) {
-            return;
-        }
-        for (auto it = entries.begin(); it != entries.end();) {
-            const Entry& entry = it->second;
-            const GPUVAddr entry_end = entry.gpu_addr + entry.size;
-            bool overlaps = false;
-            for (const DeferredUnmap& unmap : pending) {
-                if (unmap.as_id != entry.as_id) {
-                    continue;
-                }
-                if (entry.gpu_addr < unmap.gpu_addr + unmap.size && unmap.gpu_addr < entry_end) {
-                    overlaps = true;
-                    break;
-                }
-            }
-            if (overlaps) {
-                it = entries.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-
-    ::Common::unordered_map<u64, Entry> entries;
-    std::vector<DeferredUnmap> deferred;
-    std::mutex deferred_mutex;
-    std::atomic<bool> has_deferred{false};
-    bool deferred_overflow{};
-};
-
-} // namespace VideoCommon

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_opengl/gl_buffer_cache.cpp

@@ -52,7 +52,7 @@ constexpr std::array PROGRAM_LUT{
 Buffer::Buffer(BufferCacheRuntime&, VideoCommon::NullBufferParams null_params)
     : VideoCommon::BufferBase(null_params) {}
 
-Buffer::Buffer(BufferCacheRuntime& runtime, DAddr cpu_addr_, u64 size_bytes_, bool)
+Buffer::Buffer(BufferCacheRuntime& runtime, DAddr cpu_addr_, u64 size_bytes_)
     : VideoCommon::BufferBase(cpu_addr_, size_bytes_) {
     buffer.Create();
     if (runtime.device.HasDebuggingToolAttached()) {

src/video_core/renderer_opengl/gl_buffer_cache.h

@@ -23,8 +23,7 @@ class BufferCacheRuntime;
 
 class Buffer : public VideoCommon::BufferBase {
 public:
-    explicit Buffer(BufferCacheRuntime&, DAddr cpu_addr, u64 size_bytes,
+    explicit Buffer(BufferCacheRuntime&, DAddr cpu_addr, u64 size_bytes);
-                    bool sparse_compatible);
     explicit Buffer(BufferCacheRuntime&, VideoCommon::NullBufferParams);
 
     void ImmediateUpload(size_t offset, std::span<const u8> data) noexcept;

src/video_core/renderer_vulkan/vk_buffer_cache.cpp

@@ -56,8 +56,7 @@ size_t BytesPerIndex(VkIndexType index_type) {
     }
 }
 
-vk::Buffer CreateBuffer(const Device& device, const MemoryAllocator& memory_allocator, u64 size,
+vk::Buffer CreateBuffer(const Device& device, const MemoryAllocator& memory_allocator, u64 size) {
-                        VkDeviceSize sparse_alignment) {
     VkBufferUsageFlags flags =
         VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT |
         VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT |
@@ -83,9 +82,6 @@ vk::Buffer CreateBuffer(const Device& device, const MemoryAllocator& memory_allo
         .queueFamilyIndexCount = 0,
         .pQueueFamilyIndices = nullptr,
     };
-    if (sparse_alignment > 1) {
-        return memory_allocator.CreateBuffer(buffer_ci, MemoryUsage::DeviceLocal, sparse_alignment);
-    }
     return memory_allocator.CreateBuffer(buffer_ci, MemoryUsage::DeviceLocal);
 }
 } // Anonymous namespace
@@ -103,14 +99,10 @@ Buffer::Buffer(BufferCacheRuntime& runtime, VideoCommon::NullBufferParams null_p
     }
 }
 
-Buffer::Buffer(BufferCacheRuntime& runtime, DAddr cpu_addr_, u64 size_bytes_,
+Buffer::Buffer(BufferCacheRuntime& runtime, DAddr cpu_addr_, u64 size_bytes_)
-               bool sparse_compatible_)
     : VideoCommon::BufferBase(cpu_addr_, size_bytes_), device{&runtime.device},
       scheduler{&runtime.scheduler},
-      buffer{CreateBuffer(*device, runtime.memory_allocator, SizeBytes(),
+      buffer{CreateBuffer(*device, runtime.memory_allocator, SizeBytes())}, tracker{SizeBytes()} {
-                          runtime.SparseAlignmentFor(sparse_compatible_))},
-      tracker{SizeBytes()} {
-    sparse_compatible = sparse_compatible_;
     if (runtime.device.HasDebuggingToolAttached()) {
         buffer.SetObjectNameEXT(fmt::format("Buffer {:#x}", CpuAddr()).c_str());
     }
@@ -356,8 +348,7 @@ BufferCacheRuntime::BufferCacheRuntime(const Device& device_, MemoryAllocator& m
     : device{device_}, memory_allocator{memory_allocator_}, scheduler{scheduler_},
       staging_pool{staging_pool_}, guest_descriptor_queue{guest_descriptor_queue_},
       quad_index_pass(device, scheduler, descriptor_pool, staging_pool,
-                      compute_pass_descriptor_queue),
+                      compute_pass_descriptor_queue) {
-      multi_range_buffers(device_) {
     const VkDriverIdKHR driver_id = device.GetDriverID();
     limit_dynamic_storage_buffers = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY ||
                                     driver_id == VK_DRIVER_ID_ARM_PROPRIETARY;
@@ -545,37 +536,6 @@ void BufferCacheRuntime::ClearBuffer(VkBuffer dest_buffer, u32 offset, size_t si
     });
 }
 
-bool BufferCacheRuntime::BindMultiRangeStorageBuffer(u64 key, bool is_written) {
-    if (multi_range_sources.empty() || multi_range_total == 0) {
-        return false;
-    }
-    const MultiRangeRef ref = multi_range_buffers.Get(device, scheduler, memory_allocator, key,
-                                                     multi_range_sources, multi_range_total);
-    if (ref.handle == VK_NULL_HANDLE) {
-        return false;
-    }
-    if (is_written && !ref.sparse) {
-        return false;
-    }
-    if (ref.needs_gather) {
-        PreCopyBarrier();
-        VkDeviceSize dst_offset = 0;
-        for (const MultiRangeSource& source : multi_range_sources) {
-            const std::array<VideoCommon::BufferCopy, 1> copy{VideoCommon::BufferCopy{
-                .src_offset = u64(source.offset),
-                .dst_offset = u64(dst_offset),
-                .size = size_t(source.size),
-            }};
-            CopyBuffer(ref.handle, source.handle, copy, false);
-            dst_offset += source.size;
-        }
-        PostCopyBarrier();
-        multi_range_buffers.MarkGathered(key);
-    }
-    guest_descriptor_queue.AddBuffer(ref.handle, ref.address, 0, ref.size);
-    return true;
-}
-
 void BufferCacheRuntime::BindIndexBuffer(PrimitiveTopology topology, IndexFormat index_format,
                                          u32 base_vertex, u32 num_indices, VkBuffer buffer,
                                          u32 offset, [[maybe_unused]] u32 size) {

src/video_core/renderer_vulkan/vk_buffer_cache.h

@@ -8,14 +8,11 @@
 
 #include <limits>
 
-#include <boost/container/small_vector.hpp>
-
 #include "video_core/buffer_cache/buffer_cache_base.h"
 #include "video_core/buffer_cache/memory_tracker_base.h"
 #include "video_core/buffer_cache/usage_tracker.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/renderer_vulkan/vk_compute_pass.h"
-#include "video_core/renderer_vulkan/vk_multi_range_buffer.h"
 #include "video_core/renderer_vulkan/vk_staging_buffer_pool.h"
 #include "video_core/renderer_vulkan/vk_update_descriptor.h"
 #include "video_core/surface.h"
@@ -34,8 +31,7 @@ class BufferCacheRuntime;
 class Buffer : public VideoCommon::BufferBase {
 public:
     explicit Buffer(BufferCacheRuntime&, VideoCommon::NullBufferParams null_params);
-    explicit Buffer(BufferCacheRuntime& runtime, VAddr cpu_addr_, u64 size_bytes_,
+    explicit Buffer(BufferCacheRuntime& runtime, VAddr cpu_addr_, u64 size_bytes_);
-                    bool sparse_compatible_);
 
     [[nodiscard]] VkBufferView View(u32 offset, u32 size, VideoCore::Surface::PixelFormat format);
 
@@ -47,14 +43,6 @@ public:
         return device_address;
     }
 
-    [[nodiscard]] bool IsSparseCompatible() const noexcept {
-        return sparse_compatible;
-    }
-
-    [[nodiscard]] vk::MemoryLocation Location() const noexcept {
-        return buffer.Location();
-    }
-
     [[nodiscard]] bool IsRegionUsed(u64 offset, u64 size) const noexcept {
         return tracker.IsUsed(offset, size);
     }
@@ -89,7 +77,6 @@ private:
     VkDeviceAddress device_address{};
     u64 last_usage_tick{};
     bool is_null{};
-    bool sparse_compatible{};
 };
 
 class QuadArrayIndexBuffer;
@@ -138,7 +125,7 @@ public:
 
     void PreCopyBarrier();
 
-    void CopyBuffer(VkBuffer dst_buffer, VkBuffer src_buffer,
+    void CopyBuffer(VkBuffer src_buffer, VkBuffer dst_buffer,
                     std::span<const VideoCommon::BufferCopy> copies, bool barrier,
                     bool can_reorder_upload = false);
 
@@ -168,46 +155,6 @@ public:
         return ref.mapped_span;
     }
 
-    [[nodiscard]] VkDeviceSize SparseAlignmentFor(bool sparse_compatible) const noexcept {
-        if (!sparse_compatible || !multi_range_buffers.use_sparse) {
-            return 0;
-        }
-        return multi_range_buffers.block_size;
-    }
-
-    [[nodiscard]] bool PrefersSparseSources() const noexcept {
-        return multi_range_buffers.use_sparse;
-    }
-
-    void ResetMultiRange() noexcept {
-        multi_range_sources.clear();
-        multi_range_total = 0;
-    }
-
-    void PushMultiRangeSource(const Buffer& buffer, u32 offset, u32 size) {
-        const vk::MemoryLocation location = buffer.Location();
-        multi_range_sources.push_back(MultiRangeSource{
-            .handle = buffer.Handle(),
-            .memory = location.memory,
-            .memory_offset = location.offset,
-            .offset = offset,
-            .size = size,
-            .write_tick = buffer.getWriteTick(),
-            .memory_type = location.memory_type,
-        });
-        multi_range_total += size;
-    }
-
-    bool BindMultiRangeStorageBuffer(u64 key, bool is_written);
-
-    void InvalidateMultiRange(u64 key) {
-        multi_range_buffers.Invalidate(key);
-    }
-
-    void OnBufferDeleted(const Buffer& buffer) {
-        multi_range_buffers.DropOwner(scheduler, buffer.Handle());
-    }
-
     void BindUniformBuffer(const Buffer& buffer, u32 offset, u32 size) {
         BindBuffer(buffer, offset, size);
     }
@@ -261,10 +208,6 @@ private:
     std::unique_ptr<Uint8Pass> uint8_pass;
     QuadIndexedPass quad_index_pass;
 
-    MultiRangeBufferCache multi_range_buffers;
-    boost::container::small_vector<MultiRangeSource, 16> multi_range_sources;
-    VkDeviceSize multi_range_total{};
-
     bool limit_dynamic_storage_buffers = false;
     u32 max_dynamic_storage_buffers = (std::numeric_limits<u32>::max)();
 };

src/video_core/renderer_vulkan/vk_multi_range_buffer.cpp

@@ -1,338 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <algorithm>
-#include <mutex>
-#include <utility>
-
-#include "video_core/renderer_vulkan/vk_multi_range_buffer.h"
-#include "video_core/renderer_vulkan/vk_scheduler.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-MultiRangeBufferCache::MultiRangeBufferCache(const Device& device) {
-    sparse_usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT |
-                   VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
-    if (device.IsBufferDeviceAddressSupported()) {
-        sparse_usage |= VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
-    }
-    if (!device.IsSparseBindingSupported()) {
-        return;
-    }
-    u32 memory_type_bits = 0;
-    const VkDeviceSize queried = QueryBlockSize(device, memory_type_bits);
-    if (queried == 0 || memory_type_bits == 0) {
-        return;
-    }
-    block_size = queried;
-    sparse_memory_type_bits = memory_type_bits;
-    use_sparse = true;
-}
-
-VkDeviceSize MultiRangeBufferCache::QueryBlockSize(const Device& device,
-                                                   u32& memory_type_bits) const {
-    const VkDevice logical = *device.GetLogical();
-    const auto& dld = device.GetDispatchLoader();
-    const VkBufferCreateInfo probe_ci{
-        .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT,
-        .size = DEFAULT_BLOCK_SIZE,
-        .usage = sparse_usage,
-        .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
-        .queueFamilyIndexCount = 0,
-        .pQueueFamilyIndices = nullptr,
-    };
-    VkBuffer probe{};
-    if (dld.vkCreateBuffer(logical, &probe_ci, nullptr, &probe) != VK_SUCCESS) {
-        return 0;
-    }
-    const SparseBuffer owned{probe, logical, dld};
-    const VkBufferMemoryRequirementsInfo2 reqs_info{
-        .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2,
-        .pNext = nullptr,
-        .buffer = probe,
-    };
-    VkMemoryRequirements2 reqs2{
-        .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2,
-        .pNext = nullptr,
-        .memoryRequirements = {},
-    };
-    dld.vkGetBufferMemoryRequirements2(logical, &reqs_info, &reqs2);
-    memory_type_bits = reqs2.memoryRequirements.memoryTypeBits;
-    return reqs2.memoryRequirements.alignment;
-}
-
-u64 MultiRangeBufferCache::HashSources(std::span<const MultiRangeSource> sources) const {
-    u64 hash = 0xcbf29ce484222325ULL;
-    const auto mix = [&hash](u64 value) {
-        hash ^= value;
-        hash *= 0x100000001b3ULL;
-    };
-    for (const MultiRangeSource& source : sources) {
-        mix(u64(source.handle));
-        mix(u64(source.offset));
-        mix(u64(source.size));
-    }
-    return hash;
-}
-
-u64 MultiRangeBufferCache::HashContent(std::span<const MultiRangeSource> sources) const {
-    u64 hash = 0xcbf29ce484222325ULL;
-    for (const MultiRangeSource& source : sources) {
-        hash ^= source.write_tick;
-        hash *= 0x100000001b3ULL;
-    }
-    return hash;
-}
-
-bool MultiRangeBufferCache::CanBindSparse(std::span<const MultiRangeSource> sources) const {
-    return use_sparse &&
-           std::none_of(sources.begin(), sources.end(),
-                        [block = block_size, bits = sparse_memory_type_bits](auto const& e) {
-                            const VkDeviceSize memory_offset = e.memory_offset + e.offset;
-                            return e.memory == VK_NULL_HANDLE || e.memory_type >= 32 ||
-                                   ((bits >> e.memory_type) & 1) == 0 ||
-                                   (memory_offset % block) != 0 || (e.size % block) != 0;
-                        });
-}
-
-SparseBuffer MultiRangeBufferCache::CreateSparse(const Device& device, Scheduler& scheduler,
-                                                 std::span<const MultiRangeSource> sources,
-                                                 VkDeviceSize total) {
-    const VkDevice logical = *device.GetLogical();
-    const auto& dld = device.GetDispatchLoader();
-    const VkBufferCreateInfo buffer_ci{
-        .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT,
-        .size = total,
-        .usage = sparse_usage,
-        .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
-        .queueFamilyIndexCount = 0,
-        .pQueueFamilyIndices = nullptr,
-    };
-    VkBuffer raw{};
-    if (dld.vkCreateBuffer(logical, &buffer_ci, nullptr, &raw) != VK_SUCCESS) {
-        return SparseBuffer{};
-    }
-    SparseBuffer handle{raw, logical, dld};
-    std::vector<VkSparseMemoryBind> binds;
-    binds.reserve(sources.size());
-    VkDeviceSize resource_offset = 0;
-    for (const MultiRangeSource& source : sources) {
-        binds.push_back(VkSparseMemoryBind{
-            .resourceOffset = resource_offset,
-            .size = source.size,
-            .memory = source.memory,
-            .memoryOffset = source.memory_offset + source.offset,
-            .flags = 0,
-        });
-        resource_offset += source.size;
-    }
-    const VkSparseBufferMemoryBindInfo buffer_bind{
-        .buffer = raw,
-        .bindCount = static_cast<u32>(binds.size()),
-        .pBinds = binds.data(),
-    };
-    const VkBindSparseInfo bind_info{
-        .sType = VK_STRUCTURE_TYPE_BIND_SPARSE_INFO,
-        .pNext = nullptr,
-        .waitSemaphoreCount = 0,
-        .pWaitSemaphores = nullptr,
-        .bufferBindCount = 1,
-        .pBufferBinds = &buffer_bind,
-        .imageOpaqueBindCount = 0,
-        .pImageOpaqueBinds = nullptr,
-        .imageBindCount = 0,
-        .pImageBinds = nullptr,
-        .signalSemaphoreCount = 0,
-        .pSignalSemaphores = nullptr,
-    };
-    const VkFenceCreateInfo fence_ci{
-        .sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-    };
-    vk::Fence fence = device.GetLogical().CreateFence(fence_ci);
-    VkResult bind_result = VK_ERROR_UNKNOWN;
-    {
-        std::scoped_lock lock{scheduler.submit_mutex};
-        bind_result = device.GetGraphicsQueue().BindSparse(bind_info, *fence);
-    }
-    if (bind_result != VK_SUCCESS) {
-        return SparseBuffer{};
-    }
-    fence.Wait();
-    return handle;
-}
-
-void MultiRangeBufferCache::RetireEntry(Scheduler& scheduler, Entry& entry) {
-    if (!entry.sparse_handle && !entry.gathered) {
-        return;
-    }
-    if (retired.size() == retired.capacity()) {
-        DrainRetired(scheduler);
-    }
-    if (retired.size() == retired.capacity()) {
-        u64 oldest = retired.front().tick;
-        for (const Retired& item : retired) {
-            if (item.tick < oldest) {
-                oldest = item.tick;
-            }
-        }
-        scheduler.Wait(oldest);
-        DrainRetired(scheduler);
-    }
-    retired.push_back(Retired{
-        .handle = std::move(entry.sparse_handle),
-        .gathered = std::move(entry.gathered),
-        .tick = scheduler.CurrentTick(),
-    });
-}
-
-void MultiRangeBufferCache::DrainRetired(Scheduler& scheduler) {
-    size_t index = 0;
-    while (index < retired.size()) {
-        if (scheduler.IsFree(retired[index].tick)) {
-            if (index + 1 != retired.size()) {
-                retired[index] = std::move(retired.back());
-            }
-            retired.pop_back();
-        } else {
-            ++index;
-        }
-    }
-}
-
-MultiRangeRef MultiRangeBufferCache::Get(const Device& device, Scheduler& scheduler,
-                                         MemoryAllocator& memory_allocator, u64 key,
-                                         std::span<const MultiRangeSource> sources,
-                                         VkDeviceSize total) {
-    if (sources.empty() || total == 0) {
-        return MultiRangeRef{};
-    }
-    if (!retired.empty()) {
-        DrainRetired(scheduler);
-    }
-    const u64 geometry = HashSources(sources);
-    const u64 content = HashContent(sources);
-    const auto it = entries.find(key);
-    if (it != entries.end() && it->second.geometry == geometry && it->second.size == total) {
-        Entry& entry = it->second;
-        if (entry.content != content) {
-            entry.content = content;
-            entry.dirty = true;
-        }
-        MultiRangeRef ref{
-            .handle = *entry.sparse_handle,
-            .address = entry.address,
-            .size = entry.size,
-            .sparse = true,
-            .needs_gather = false,
-        };
-        if (!entry.sparse_handle) {
-            ref.handle = *entry.gathered;
-            ref.sparse = false;
-            ref.needs_gather = entry.dirty;
-        }
-        return ref;
-    }
-    if (it != entries.end()) {
-        RetireEntry(scheduler, it->second);
-        entries.erase(it);
-    }
-
-    Entry entry{};
-    entry.geometry = geometry;
-    entry.content = content;
-    entry.size = total;
-    if (CanBindSparse(sources)) {
-        entry.sparse_handle = CreateSparse(device, scheduler, sources, total);
-        if (entry.sparse_handle) {
-            entry.owners.reserve(sources.size());
-            for (const MultiRangeSource& source : sources) {
-                entry.owners.push_back(source.handle);
-            }
-        }
-    }
-    if (!entry.sparse_handle) {
-        VkBufferUsageFlags flags = VK_BUFFER_USAGE_TRANSFER_SRC_BIT |
-                                   VK_BUFFER_USAGE_TRANSFER_DST_BIT |
-                                   VK_BUFFER_USAGE_STORAGE_BUFFER_BIT;
-        if (device.IsBufferDeviceAddressSupported()) {
-            flags |= VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
-        }
-        const VkBufferCreateInfo gather_ci{
-            .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
-            .pNext = nullptr,
-            .flags = 0,
-            .size = total,
-            .usage = flags,
-            .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
-            .queueFamilyIndexCount = 0,
-            .pQueueFamilyIndices = nullptr,
-        };
-        entry.gathered = memory_allocator.CreateBuffer(gather_ci, MemoryUsage::DeviceLocal);
-        entry.dirty = true;
-    }
-    if (device.IsBufferDeviceAddressSupported()) {
-        VkBuffer address_handle = *entry.sparse_handle;
-        if (!entry.sparse_handle) {
-            address_handle = *entry.gathered;
-        }
-        entry.address = device.GetLogical().GetBufferDeviceAddress(address_handle);
-    }
-
-    MultiRangeRef ref{
-        .handle = *entry.sparse_handle,
-        .address = entry.address,
-        .size = entry.size,
-        .sparse = true,
-        .needs_gather = false,
-    };
-    if (!entry.sparse_handle) {
-        ref.handle = *entry.gathered;
-        ref.sparse = false;
-        ref.needs_gather = true;
-    }
-    entries.emplace(key, std::move(entry));
-    return ref;
-}
-
-void MultiRangeBufferCache::MarkGathered(u64 key) {
-    if (auto const it = entries.find(key); it != entries.end()) {
-        it->second.dirty = false;
-    }
-}
-
-void MultiRangeBufferCache::DropOwner(Scheduler& scheduler, VkBuffer owner) {
-    if (owner == VK_NULL_HANDLE) {
-        return;
-    }
-    for (auto it = entries.begin(); it != entries.end();) {
-        Entry& entry = it->second;
-        bool owned = false;
-        for (const VkBuffer handle : entry.owners) {
-            if (handle == owner) {
-                owned = true;
-                break;
-            }
-        }
-        if (!owned) {
-            ++it;
-            continue;
-        }
-        RetireEntry(scheduler, entry);
-        it = entries.erase(it);
-    }
-}
-
-void MultiRangeBufferCache::Invalidate(u64 key) {
-    if (auto const it = entries.find(key); it != entries.end()) {
-        it->second.dirty = true;
-    }
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/vk_multi_range_buffer.h

@@ -1,105 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <span>
-#include <vector>
-
-#include <boost/container/static_vector.hpp>
-
-#include "common/common_funcs.h"
-#include "common/common_types.h"
-#include "common/container/unordered_map.h"
-#include "video_core/vulkan_common/vulkan_memory_allocator.h"
-#include "video_core/vulkan_common/vulkan_wrapper.h"
-
-namespace Vulkan {
-
-using SparseBuffer = vk::Handle<VkBuffer, VkDevice, vk::DeviceDispatch>;
-
-class Device;
-class Scheduler;
-
-struct MultiRangeSource {
-    VkBuffer handle{};
-    VkDeviceMemory memory{};
-    VkDeviceSize memory_offset{};
-    VkDeviceSize offset{};
-    VkDeviceSize size{};
-    u64 write_tick{};
-    u32 memory_type{};
-};
-
-struct MultiRangeRef {
-    VkBuffer handle{};
-    VkDeviceAddress address{};
-    VkDeviceSize size{};
-    bool sparse{};
-    bool needs_gather{};
-};
-
-class MultiRangeBufferCache final {
-public:
-    static constexpr VkDeviceSize DEFAULT_BLOCK_SIZE = 64 * 1024;
-    static constexpr size_t MAX_RETIRED = 256;
-
-    explicit MultiRangeBufferCache(const Device& device);
-
-    YUZU_NON_COPYABLE(MultiRangeBufferCache);
-
-    [[nodiscard]] MultiRangeRef Get(const Device& device, Scheduler& scheduler,
-                                    MemoryAllocator& memory_allocator, u64 key,
-                                    std::span<const MultiRangeSource> sources,
-                                    VkDeviceSize total);
-
-    void MarkGathered(u64 key);
-
-    void Invalidate(u64 key);
-
-    void DropOwner(Scheduler& scheduler, VkBuffer owner);
-
-    VkDeviceSize block_size{DEFAULT_BLOCK_SIZE};
-    bool use_sparse{};
-
-private:
-    struct Retired {
-        SparseBuffer handle;
-        vk::Buffer gathered;
-        u64 tick{};
-    };
-
-    struct Entry {
-        vk::Buffer gathered;
-        SparseBuffer sparse_handle;
-        std::vector<VkBuffer> owners;
-        VkDeviceAddress address{};
-        VkDeviceSize size{};
-        u64 geometry{};
-        u64 content{};
-        bool dirty{true};
-    };
-
-    [[nodiscard]] u64 HashSources(std::span<const MultiRangeSource> sources) const;
-
-    [[nodiscard]] u64 HashContent(std::span<const MultiRangeSource> sources) const;
-
-    [[nodiscard]] bool CanBindSparse(std::span<const MultiRangeSource> sources) const;
-
-    [[nodiscard]] SparseBuffer CreateSparse(const Device& device, Scheduler& scheduler,
-                                            std::span<const MultiRangeSource> sources,
-                                            VkDeviceSize total);
-
-    [[nodiscard]] VkDeviceSize QueryBlockSize(const Device& device, u32& memory_type_bits) const;
-
-    void RetireEntry(Scheduler& scheduler, Entry& entry);
-
-    void DrainRetired(Scheduler& scheduler);
-
-    ::Common::unordered_map<u64, Entry> entries;
-    boost::container::static_vector<Retired, MAX_RETIRED> retired;
-    u32 sparse_memory_type_bits{};
-    VkBufferUsageFlags sparse_usage{};
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/vk_present_manager.cpp

@@ -338,7 +338,7 @@ void PresentManager::PresentThread(std::stop_token token) {
             // By exchanging the lock ownership we take the swapchain lock
             // before the queue lock goes out of scope. This way the swapchain
             // lock in WaitPresent is guaranteed to occur after here.
-            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_rasterizer.cpp

@@ -819,7 +819,6 @@ void RasterizerVulkan::ModifyGPUMemory(size_t as_id, GPUVAddr addr, u64 size) {
         std::scoped_lock lock{texture_cache.mutex};
         texture_cache.UnmapGPUMemory(as_id, addr, size);
     }
-    buffer_cache.UnmapGPUMemory(as_id, addr, size);
 }
 
 void RasterizerVulkan::SignalFence(std::function<void()>&& func) {

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_device.cpp

@@ -1570,8 +1570,6 @@ void Device::SetupFamilies(VkSurfaceKHR surface) {
     }
     if (graphics) {
         graphics_family = *graphics;
-        graphics_family_sparse_binding =
-            (queue_family_properties[*graphics].queueFlags & VK_QUEUE_SPARSE_BINDING_BIT) != 0;
     }
     if (present) {
         present_family = *present;

src/video_core/vulkan_common/vulkan_device.h

@@ -317,10 +317,6 @@ public:
         return properties.driver.driverID;
     }
 
-    bool IsSparseBindingSupported() const {
-        return features.features.sparseBinding && graphics_family_sparse_binding;
-    }
-
     /// Returns true for tile-based deferred renderers.
     bool IsTiler() const {
         switch (GetDriverID()) {
@@ -1151,7 +1147,6 @@ private:
     u32 instance_version{};      ///< Vulkan instance version.
     u32 graphics_family{};       ///< Main graphics queue family index.
     u32 present_family{};        ///< Main present queue family index.
-    bool graphics_family_sparse_binding{};
 
     struct Extensions {
 #define EXTENSION(prefix, macro_name, var_name) bool var_name{};

src/video_core/vulkan_common/vulkan_memory_allocator.cpp

@@ -26,383 +26,350 @@
 #include "common/settings.h"
 
 namespace Vulkan {
-namespace {
+    namespace {
 
 // Helpers translating MemoryUsage to flags/usage
 
-    [[maybe_unused]] VkMemoryPropertyFlags MemoryUsagePropertyFlags(MemoryUsage usage) {
+        [[maybe_unused]] VkMemoryPropertyFlags MemoryUsagePropertyFlags(MemoryUsage usage) {
-        switch (usage) {
+            switch (usage) {
-            case MemoryUsage::DeviceLocal:
+                case MemoryUsage::DeviceLocal:
-                return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
+                    return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
-            case MemoryUsage::Upload:
+                case MemoryUsage::Upload:
-                return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                    return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+                           VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-            case MemoryUsage::Download:
+                case MemoryUsage::Download:
-                return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                    return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                        VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
+                           VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
-                        VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
+                           VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
-            case MemoryUsage::Stream:
+                case MemoryUsage::Stream:
-                return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
+                    return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
-                        VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
+                           VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                        VK_MEMORY_PROPERTY_HOST_COHERENT_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) {
+        [[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferredVmaFlags(MemoryUsage usage) {
-        if (usage == MemoryUsage::Download) {
+            if (usage == MemoryUsage::Download) {
-            return VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+                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) {
+        [[nodiscard]] VmaAllocationCreateFlags MemoryUsageVmaFlags(MemoryUsage usage) {
-        switch (usage) {
+            switch (usage) {
-            case MemoryUsage::Upload:
+                case MemoryUsage::Upload:
-            case MemoryUsage::Stream:
+                case MemoryUsage::Stream:
-                return VMA_ALLOCATION_CREATE_MAPPED_BIT |
+                    return VMA_ALLOCATION_CREATE_MAPPED_BIT |
-                        VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;
+                           VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;
-            case MemoryUsage::Download:
+                case MemoryUsage::Download:
-                return VMA_ALLOCATION_CREATE_MAPPED_BIT |
+                    return VMA_ALLOCATION_CREATE_MAPPED_BIT |
-                        VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;
+                           VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;
-            case MemoryUsage::DeviceLocal:
+                case MemoryUsage::DeviceLocal:
-                return {};
+                    return {};
+            }
+            return {};
         }
-        return {};
-    }
 
-    [[nodiscard]] VmaMemoryUsage MemoryUsageVma(MemoryUsage usage) {
+        [[nodiscard]] VmaMemoryUsage MemoryUsageVma(MemoryUsage usage) {
-        switch (usage) {
+            switch (usage) {
-            case MemoryUsage::DeviceLocal:
+                case MemoryUsage::DeviceLocal:
-            case MemoryUsage::Stream:
+                case MemoryUsage::Stream:
-                return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
+                    return VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
-            case MemoryUsage::Upload:
+                case MemoryUsage::Upload:
-            case MemoryUsage::Download:
+                case MemoryUsage::Download:
-                return VMA_MEMORY_USAGE_AUTO_PREFER_HOST;
+                    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,
+    MemoryCommit::MemoryCommit(VmaAllocator alloc, VmaAllocation a,
-                            const VmaAllocationInfo &info) noexcept
+                               const VmaAllocationInfo &info) noexcept
-        : allocator{alloc}, allocation{a}, memory{info.deviceMemory},
+            : allocator{alloc}, allocation{a}, memory{info.deviceMemory},
-            offset{info.offset}, size{info.size}, mapped_ptr{info.pMappedData} {
+              offset{info.offset}, size{info.size}, mapped_ptr{info.pMappedData} {
-    // Log GPU memory allocation
+        // Log GPU memory allocation
-    if (GPU::Logging::IsActive() &&
-        Settings::values.gpu_log_memory_tracking.GetValue()) {
-        GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
-            reinterpret_cast<uintptr_t>(memory),
-            static_cast<u64>(size),
-            0  // Memory property flags (not easily available from VMA)
-        );
-    }
-}
-
-MemoryCommit::~MemoryCommit() { Release(); }
-
-MemoryCommit::MemoryCommit(MemoryCommit &&rhs) noexcept
-        : allocator{std::exchange(rhs.allocator, nullptr)},
-            allocation{std::exchange(rhs.allocation, nullptr)},
-            memory{std::exchange(rhs.memory, VK_NULL_HANDLE)},
-            offset{std::exchange(rhs.offset, 0)},
-            size{std::exchange(rhs.size, 0)},
-            mapped_ptr{std::exchange(rhs.mapped_ptr, nullptr)} {}
-
-MemoryCommit &MemoryCommit::operator=(MemoryCommit &&rhs) noexcept {
-    if (this != &rhs) {
-        Release();
-        allocator = std::exchange(rhs.allocator, nullptr);
-        allocation = std::exchange(rhs.allocation, nullptr);
-        memory = std::exchange(rhs.memory, VK_NULL_HANDLE);
-        offset = std::exchange(rhs.offset, 0);
-        size = std::exchange(rhs.size, 0);
-        mapped_ptr = std::exchange(rhs.mapped_ptr, nullptr);
-    }
-    return *this;
-}
-
-std::span<u8> MemoryCommit::Map()
-{
-    if (!allocation) return {};
-    if (!mapped_ptr) {
-        if (vmaMapMemory(allocator, allocation, &mapped_ptr) != VK_SUCCESS) return {};
-    }
-    const size_t n = static_cast<size_t>(std::min<VkDeviceSize>(size,
-                                                                (std::numeric_limits<size_t>::max)()));
-    return std::span<u8>{static_cast<u8 *>(mapped_ptr), n};
-}
-
-std::span<const u8> MemoryCommit::Map() const
-{
-    if (!allocation) return {};
-    if (!mapped_ptr) {
-        void *p = nullptr;
-        if (vmaMapMemory(allocator, allocation, &p) != VK_SUCCESS) return {};
-        const_cast<MemoryCommit *>(this)->mapped_ptr = p;
-    }
-    const size_t n = static_cast<size_t>(std::min<VkDeviceSize>(size,
-                                                                (std::numeric_limits<size_t>::max)()));
-    return std::span<const u8>{static_cast<const u8 *>(mapped_ptr), n};
-}
-
-void MemoryCommit::Unmap()
-{
-    if (allocation && mapped_ptr) {
-        vmaUnmapMemory(allocator, allocation);
-        mapped_ptr = nullptr;
-    }
-}
-
-void MemoryCommit::Release() {
-    if (allocation && allocator) {
-        // Log GPU memory deallocation
         if (GPU::Logging::IsActive() &&
-            Settings::values.gpu_log_memory_tracking.GetValue() &&
+            Settings::values.gpu_log_memory_tracking.GetValue()) {
-            memory != VK_NULL_HANDLE) {
+            GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
-            GPU::Logging::GPULogger::GetInstance().LogMemoryDeallocation(
+                reinterpret_cast<uintptr_t>(memory),
-                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_)
+    void MemoryCommit::Release() {
-        : device{device_}, allocator{device.GetAllocator()},
+        if (allocation && allocator) {
-            properties{device_.GetPhysical().GetMemoryProperties().memoryProperties},
+            // Log GPU memory deallocation
-            buffer_image_granularity{
+            if (GPU::Logging::IsActive() &&
-                    device_.GetPhysical().GetProperties().limits.bufferImageGranularity} {
+                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 (mapped_ptr) {
-    if (device.HasDebuggingToolAttached())
+                vmaUnmapMemory(allocator, allocation);
-    {
+                mapped_ptr = nullptr;
-        using namespace Common::Literals;
+            }
-        ForEachDeviceLocalHostVisibleHeap(device, [this](size_t heap_idx, VkMemoryHeap &heap) {
+            vmaFreeMemory(allocator, allocation);
-            if (heap.size <= 256_MiB) {
+        }
-                for (u32 t = 0; t < properties.memoryTypeCount; ++t) {
+        allocation = nullptr;
-                    if (properties.memoryTypes[t].heapIndex == heap_idx) {
+        allocator = nullptr;
-                        valid_memory_types &= ~(1u << t);
+        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
+    vk::Image MemoryAllocator::CreateImage(const VkImageCreateInfo &ci) const
-{
+    {
-    const VmaAllocationCreateInfo alloc_ci = {
+        const VmaAllocationCreateInfo alloc_ci = {
-            .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT,
+                .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT,
-            .usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE,
+                .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,
+            .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
-            .memoryTypeBits = 0,
+            .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
             .pool = VK_NULL_HANDLE,
             .pUserData = nullptr,
             .priority = 0.f,
-    };
+        };
 
-    VkImage handle{};
+        VkBuffer handle{};
-    VmaAllocation allocation{};
+        VmaAllocationInfo alloc_info{};
-    VmaAllocationInfo alloc_info{};
+        VmaAllocation allocation{};
-    vk::Check(vmaCreateImage(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
+        VkMemoryPropertyFlags property_flags{};
 
-    // Log GPU memory allocation for images
+        vk::Check(vmaCreateBuffer(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
-    if (GPU::Logging::IsActive() &&
+        vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);
-        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,
+        // Log GPU memory allocation for buffers
-                        device.GetDispatchLoader());
+        if (GPU::Logging::IsActive() &&
-}
+            Settings::values.gpu_log_memory_tracking.GetValue()) {
-
+            GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
-vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage) const {
+                reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),
-    // MESA will do memcpy() if not marked as host cached, so just force mark it for most buffers
+                static_cast<u64>(alloc_info.size),
-    auto const anv_flags = (usage == MemoryUsage::Stream
+                property_flags
-        && 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;
-
-    const vk::MemoryLocation location{
-        .memory = alloc_info.deviceMemory,
-        .offset = alloc_info.offset,
-        .memory_type = alloc_info.memoryType,
-    };
-    return vk::Buffer(handle, *device.GetLogical(), allocator, allocation, mapped_data, is_coherent,
-                      location, device.GetDispatchLoader());
-}
-
-vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage,
-                                         VkDeviceSize min_alignment) const {
-    if (min_alignment <= 1) {
-        return CreateBuffer(ci, usage);
-    }
-    VkMemoryPropertyFlags anv_flags = 0;
-    if (usage == MemoryUsage::Stream &&
-        device.GetDriverID() == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA) {
-        anv_flags = VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
-    }
-    u32 memory_type_bits = valid_memory_types;
-    if (usage == MemoryUsage::Stream) {
-        memory_type_bits = 0u;
-    }
-    const VmaAllocationCreateInfo alloc_ci = {
-        .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage),
-        .usage = MemoryUsageVma(usage),
-        .requiredFlags = 0,
-        .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
-        .memoryTypeBits = memory_type_bits,
-        .pool = VK_NULL_HANDLE,
-        .pUserData = nullptr,
-        .priority = 0.f,
-    };
-
-    VkBuffer handle{};
-    VmaAllocationInfo alloc_info{};
-    VmaAllocation allocation{};
-    VkMemoryPropertyFlags property_flags{};
-
-    vk::Check(vmaCreateBufferWithAlignment(allocator, &ci, &alloc_ci, min_alignment, &handle,
-                                           &allocation, &alloc_info));
-    vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);
-
-    u8 *data = reinterpret_cast<u8 *>(alloc_info.pMappedData);
-    std::span<u8> mapped_data{};
-    if (data) {
-        mapped_data = std::span<u8>{data, ci.size};
-    }
-    const bool is_coherent = (property_flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0;
-
-    const vk::MemoryLocation location{
-        .memory = alloc_info.deviceMemory,
-        .offset = alloc_info.offset,
-        .memory_type = alloc_info.memoryType,
-    };
-    return vk::Buffer(handle, *device.GetLogical(), allocator, allocation, mapped_data, is_coherent,
-                      location, 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);
         }
+
+        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);
+    MemoryCommit MemoryAllocator::Commit(const VkMemoryRequirements &reqs, MemoryUsage usage)
-    return MemoryCommit(allocator, a, info);
+    {
-}
+        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) {
+        VmaAllocation a{};
-    // Allocate memory appropriate for this buffer automatically
+        VmaAllocationInfo info{};
-    const auto vma_usage = MemoryUsageVma(usage);
 
-    VmaAllocationCreateInfo ci{};
+        VkResult res = vmaAllocateMemory(allocator, &reqs, &ci, &a, &info);
-    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;
+        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{};
+            // Relax 2: if we preferred DEVICE_LOCAL, drop that preference
-    VmaAllocationInfo info{};
+            if (res != VK_SUCCESS && (ci.preferredFlags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
-
+                auto ci3 = ci2;
-    // Let VMA infer memory requirements from the buffer
+                ci3.preferredFlags &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
-    VkResult res = vmaAllocateMemoryForBuffer(allocator, raw, &ci, &a, &info);
+                res = vmaAllocateMemory(allocator, &reqs, &ci3, &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);
+        return MemoryCommit(allocator, a, info);
     }
 
-    vk::Check(res);
+    MemoryCommit MemoryAllocator::Commit(const vk::Buffer &buffer, MemoryUsage usage) {
-    vk::Check(vmaBindBufferMemory2(allocator, a, 0, raw, nullptr));
+        // Allocate memory appropriate for this buffer automatically
-    return MemoryCommit(allocator, a, info);
+        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/video_core/vulkan_common/vulkan_memory_allocator.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 2019 yuzu Emulator Project
@@ -107,9 +107,6 @@ namespace Vulkan {
 
         vk::Buffer CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage) const;
 
-        vk::Buffer CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage,
-                                VkDeviceSize min_alignment) const;
-
         /**
          * Commits a memory with the specified requirements.
          *

src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -229,7 +229,6 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept {
     X(vkGetPipelineExecutableStatisticsKHR);
     X(vkGetSemaphoreCounterValue);
     X(vkMapMemory);
-    X(vkQueueBindSparse);
     X(vkQueueSubmit);
     X(vkQueueSubmit2);
     X(vkResetFences);

src/video_core/vulkan_common/vulkan_wrapper.h

@@ -345,7 +345,6 @@ struct DeviceDispatch : InstanceDispatch {
     PFN_vkGetQueryPoolResults vkGetQueryPoolResults{};
     PFN_vkGetSemaphoreCounterValue vkGetSemaphoreCounterValue{};
     PFN_vkMapMemory vkMapMemory{};
-    PFN_vkQueueBindSparse vkQueueBindSparse{};
     PFN_vkQueueSubmit vkQueueSubmit{};
     PFN_vkQueueSubmit2 vkQueueSubmit2{};
     PFN_vkResetFences vkResetFences{};
@@ -741,20 +740,13 @@ private:
     const DeviceDispatch* dld = nullptr;
 };
 
-struct MemoryLocation {
-    VkDeviceMemory memory{};
-    VkDeviceSize offset{};
-    u32 memory_type{};
-};
-
 class Buffer {
 public:
     explicit Buffer(VkBuffer handle_, VkDevice owner_, VmaAllocator allocator_,
                     VmaAllocation allocation_, std::span<u8> mapped_, bool is_coherent_,
-                    MemoryLocation location_, const DeviceDispatch& dld_) noexcept
+                    const DeviceDispatch& dld_) noexcept
         : handle{handle_}, owner{owner_}, allocator{allocator_},
-          allocation{allocation_}, mapped{mapped_}, location{location_},
+          allocation{allocation_}, mapped{mapped_}, is_coherent{is_coherent_}, dld{&dld_} {}
-          is_coherent{is_coherent_}, dld{&dld_} {}
     Buffer() = default;
 
     Buffer(const Buffer&) = delete;
@@ -762,7 +754,7 @@ public:
 
     Buffer(Buffer&& rhs) noexcept
         : handle{std::exchange(rhs.handle, VkBuffer{})}, owner{rhs.owner}, allocator{rhs.allocator},
-          allocation{rhs.allocation}, mapped{rhs.mapped}, location{rhs.location},
+          allocation{rhs.allocation}, mapped{rhs.mapped},
           is_coherent{rhs.is_coherent}, dld{rhs.dld} {}
 
     Buffer& operator=(Buffer&& rhs) noexcept {
@@ -772,7 +764,6 @@ public:
         allocator = rhs.allocator;
         allocation = rhs.allocation;
         mapped = rhs.mapped;
-        location = rhs.location;
         is_coherent = rhs.is_coherent;
         dld = rhs.dld;
         return *this;
@@ -820,10 +811,6 @@ public:
 
     void SetObjectNameEXT(const char* name) const;
 
-    MemoryLocation Location() const noexcept {
-        return location;
-    }
-
 private:
     void Release() const noexcept;
 
@@ -832,7 +819,6 @@ private:
     VmaAllocator allocator = nullptr;
     VmaAllocation allocation = nullptr;
     std::span<u8> mapped = {};
-    MemoryLocation location{};
     bool is_coherent = false;
     const DeviceDispatch* dld = nullptr;
 };
@@ -857,11 +843,6 @@ public:
         return dld->vkQueueSubmit2(queue, submit_infos.size(), submit_infos.data(), fence);
     }
 
-    VkResult BindSparse(Span<VkBindSparseInfo> bind_infos,
-                        VkFence fence = VK_NULL_HANDLE) const noexcept {
-        return dld->vkQueueBindSparse(queue, bind_infos.size(), bind_infos.data(), fence);
-    }
-
     VkResult Present(const VkPresentInfoKHR& present_info) const noexcept {
         return dld->vkQueuePresentKHR(queue, &present_info);
     }

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

tools/cpm/cmake/package/version.cmake

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