Update src/shader_recompiler/backend/glsl/emit_glsl.cpp

unrelated. merely to avoid build error.
2026-09-05 03:54:32 +00:00 · 2026-09-05 05:47:48 +02:00 · 2026-09-05 05:43:32 +02:00 · 2026-09-04 20:44:46 -03:00 · 2026-09-04 13:32:36 +02:00 · 2026-09-02 14:04:35 +02:00
48 changed files with 734 additions and 829 deletions
@@ -63,3 +63,6 @@ artifacts
 /install*
 vulkansdk*.exe
 *.tar.zst
+
+# Build-time generated external sources
+externals/generated
@@ -214,8 +214,6 @@ 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)
@@ -223,6 +221,8 @@ 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)
@@ -238,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" OFF)
+cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT (WIN32 AND ARCHITECTURE_arm64) AND NOT APPLE AND NOT ANDROID" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)

 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
@@ -186,12 +186,6 @@
        "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",
@@ -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
+  - Unavailable on Windows/ARM64 and on Android
  - You probably shouldn't turn this off.

 ### Qt
@@ -136,48 +136,49 @@ if(ENABLE_CUBEB)
    endif()
 endif()

-if (NOT ANDROID)
-    if (NOT YUZU_USE_BUNDLED_SDL3)
-        if (NOT WIN32)
-            # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
-            # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
-            # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
-            # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
-            set(SDL_UNUSED_SUBSYSTEMS
-                File Filesystem
-                Locale Power Render)
-            foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
-              string(TOUPPER ${_SUB} _OPT)
-              set(SDL_${_OPT} OFF)
-            endforeach()
+if (NOT YUZU_USE_BUNDLED_SDL3)
+    if (NOT WIN32)
+        # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
+        # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
+        # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
+        # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
+        set(SDL_UNUSED_SUBSYSTEMS
+            File Filesystem
+            Locale Power Render)
+        foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
+          string(TOUPPER ${_SUB} _OPT)
+          set(SDL_${_OPT} OFF)
+        endforeach()

-            set(HIDAPI ON)
-        endif()
-
-        if (APPLE)
-            set(SDL_FILE ON)
-        endif()
-
-        AddJsonPackage(sdl3)
-    else()
-        message(STATUS "Using bundled SDL3")
-        AddJsonPackage(sdl3-ci)
+        set(HIDAPI ON)
    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()
+    if (APPLE)
+        set(SDL_FILE ON)
+    endif()
+
+    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()

-set(BUILD_SHARED_LIBS OFF)
+# 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()

 # SPIRV Headers
 AddJsonPackage(spirv-headers)
@@ -385,13 +386,6 @@ 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)
@@ -11,6 +11,7 @@
 #include <limits>
 #include <span>
 #include <array>
+#include <algorithm>
 #include <time.h>

 namespace Tz {
@@ -272,6 +272,13 @@ 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 {
@@ -9,6 +9,9 @@
 -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
@@ -16,6 +16,7 @@ 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
@@ -52,6 +53,8 @@ object NativeLibrary {
    init {
        try {
            System.loadLibrary("yuzu-android")
+            SDL.setupJNI()
+            initJvm()
        } catch (ex: UnsatisfiedLinkError) {
            error("[NativeLibrary] $ex")
        }
@@ -367,6 +370,7 @@ object NativeLibrary {
        NetPlayManager.clearChat()
    }

+    external fun initJvm()
    external fun initMultiplayer()

    @Keep
@@ -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)
+target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log GLESv2)
 if (ARCHITECTURE_arm64)
    target_link_libraries(yuzu-android PRIVATE adrenotools)
 endif()
@@ -1730,6 +1730,15 @@ 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) {
@@ -800,7 +800,6 @@
    <string name="theme_mode_dark">تاریک</string>

    <!-- Audio output engines -->
-    <string name="oboe">oboe</string>
    <string name="cubeb">cubeb</string>

    <!-- Anisotropic filtering options -->
@@ -465,13 +465,13 @@

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

    <!-- Audio output engines -->
-    <string name="oboe" translatable="false">oboe</string>
+    <string name="sdl3" translatable="false">SDL3</string>
    <string name="cubeb" translatable="false">cubeb</string>

    <!-- Anisotropic filtering options -->
@@ -238,20 +238,11 @@ if (ENABLE_CUBEB)
    target_compile_definitions(audio_core PRIVATE HAVE_CUBEB=1)
 endif()

-if(ANDROID)
-    target_sources(audio_core PRIVATE
-        sink/oboe_sink.cpp
-        sink/oboe_sink.h)
+target_sources(audio_core PRIVATE
+    sink/sdl3_sink.cpp
+    sink/sdl3_sink.h)

-    target_link_libraries(audio_core PRIVATE oboe)
-    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()
+target_link_libraries(audio_core PRIVATE SDL3::SDL3)
+target_compile_definitions(audio_core PRIVATE HAVE_SDL3)

 create_target_directory_groups(audio_core)
@@ -1,230 +0,0 @@
-// 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
@@ -1,75 +0,0 @@
-// 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
@@ -10,9 +10,6 @@
 #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
@@ -43,24 +40,8 @@ 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,
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 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->GetDoubleField(jdouble, GetDoubleValueField());
+    return env->CallDoubleMethod(jdouble, GetDoubleValueMethod());
 }

 jobject ToJDouble(JNIEnv* env, double value) {
@@ -59,7 +59,7 @@ jobject ToJDouble(JNIEnv* env, double value) {
 }

 s32 GetJInteger(JNIEnv* env, jobject jinteger) {
-    return env->GetIntField(jinteger, GetIntegerValueField());
+    return env->CallIntMethod(jinteger, GetIntegerValueMethod());
 }

 jobject ToJInteger(JNIEnv* env, s32 value) {
@@ -67,7 +67,7 @@ jobject ToJInteger(JNIEnv* env, s32 value) {
 }

 bool GetJBoolean(JNIEnv* env, jobject jboolean) {
-    return env->GetBooleanField(jboolean, GetBooleanValueField());
+    return env->CallBooleanMethod(jboolean, GetBooleanValueMethod());
 }

 jobject ToJBoolean(JNIEnv* env, bool value) {
@@ -63,15 +63,15 @@ static jfieldID s_patch_title_id_field;

 static jclass s_double_class;
 static jmethodID s_double_constructor;
-static jfieldID s_double_value_field;
+static jmethodID s_double_value_method;

 static jclass s_integer_class;
 static jmethodID s_integer_constructor;
-static jfieldID s_integer_value_field;
+static jmethodID s_integer_value_method;

 static jclass s_boolean_class;
 static jmethodID s_boolean_constructor;
-static jfieldID s_boolean_value_field;
+static jmethodID s_boolean_value_method;

 static jclass s_player_input_class;
 static jmethodID s_player_input_constructor;
@@ -103,7 +103,6 @@ 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() {
@@ -299,8 +298,8 @@ namespace Common::Android {
        return s_double_constructor;
    }

-    jfieldID GetDoubleValueField() {
-        return s_double_value_field;
+    jmethodID GetDoubleValueMethod() {
+        return s_double_value_method;
    }

    jclass GetIntegerClass() {
@@ -311,8 +310,8 @@ namespace Common::Android {
        return s_integer_constructor;
    }

-    jfieldID GetIntegerValueField() {
-        return s_integer_value_field;
+    jmethodID GetIntegerValueMethod() {
+        return s_integer_value_method;
    }

    jclass GetBooleanClass() {
@@ -323,8 +322,8 @@ namespace Common::Android {
        return s_boolean_constructor;
    }

-    jfieldID GetBooleanValueField() {
-        return s_boolean_value_field;
+    jmethodID GetBooleanValueMethod() {
+        return s_boolean_value_method;
    }

    jclass GetPlayerInputClass() {
@@ -429,188 +428,6 @@ 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) {
@@ -645,4 +462,183 @@ 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
@@ -11,6 +11,7 @@

 namespace Common::Android {

+void Initialize(JavaVM* vm, JNIEnv *env);
 JNIEnv* GetEnvForThread();

 /**
@@ -80,15 +81,15 @@ jfieldID GetPatchTitleIdField();

 jclass GetDoubleClass();
 jmethodID GetDoubleConstructor();
-jfieldID GetDoubleValueField();
+jmethodID GetDoubleValueMethod();

 jclass GetIntegerClass();
 jmethodID GetIntegerConstructor();
-jfieldID GetIntegerValueField();
+jmethodID GetIntegerValueMethod();

 jclass GetBooleanClass();
 jmethodID GetBooleanConstructor();
-jfieldID GetBooleanValueField();
+jmethodID GetBooleanValueMethod();

 jclass GetPlayerInputClass();
 jmethodID GetPlayerInputConstructor();
@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <string>
+#include <cstdlib>
 #include <string_view>
 #ifdef _WIN32
 #include <llvm/Demangle/Demangle.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, Oboe, };
+enum class AudioEngine : u32 { Auto, Cubeb, Sdl3, Null, };
 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}, {"oboe", AudioEngine::Oboe},
+        {"null", AudioEngine::Null},
    };
 }
 /// @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::Oboe;
+    return AudioEngine::Null;
 }

 ENUM(AudioMode, Mono, Stereo, Surround);
@@ -160,26 +160,16 @@ 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);

-    auto& memory = guest_ctx->parent->m_running_thread->GetOwnerProcess()->GetMemory();
-
    // 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;
+    // 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;
    }
+
    // We couldn't handle the access.
    return HandleFailedGuestFault(guest_ctx, raw_info, raw_context);
 }
@@ -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{signal_pipe_}
+            , signal_pipe{std::move(signal_pipe_)}
            , active_thread{kernel, nullptr}
        {}

@@ -1021,6 +1021,9 @@ 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);
    }

@@ -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->GetIntField(axis, Common::Android::GetIntegerValueField()));
+        axes.insert(env->CallIntMethod(axis, Common::Android::GetIntegerValueMethod()));
    }
    return axes;
 }
@@ -1,3 +1,6 @@
+// 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

@@ -29,7 +32,7 @@ struct FuncTraits<ReturnType_ (*)(Args...)> {
 };

 template <auto func, typename... Args>
-void SetDefinition(EmitContext& ctx, IR::Inst* inst, Args... args) {
+[[maybe_unused]] void SetDefinition(EmitContext& ctx, IR::Inst* inst, Args... args) {
    inst->SetDefinition<Id>(func(ctx, std::forward<Args>(args)...));
 }

@@ -492,6 +492,9 @@ void SetupCapabilities(const Profile& profile, const Info& info, EmitContext& ct
        if (ctx.uses_nonuniform_storage_texel_buffer) {
            ctx.AddCapability(spv::Capability::StorageTexelBufferArrayNonUniformIndexing);
        }
+        if (ctx.uses_nonuniform_storage_buffer) {
+            ctx.AddCapability(spv::Capability::StorageBufferArrayNonUniformIndexing);
+        }
    }
 }

@@ -4,8 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <bit>
-
 #include "shader_recompiler/backend/spirv/emit_spirv.h"
 #include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
 #include "shader_recompiler/backend/spirv/spirv_emit_context.h"
@@ -23,29 +21,13 @@ Id SharedPointer(EmitContext& ctx, Id offset, u32 index_offset = 0) {
               : ctx.OpAccessChain(ctx.shared_u32, ctx.shared_memory_u32, index);
 }

-Id StorageIndex(EmitContext& ctx, const IR::Value& offset, size_t element_size) {
-    if (offset.IsImmediate()) {
-        const u32 imm_offset{static_cast<u32>(offset.U32() / element_size)};
-        return ctx.Const(imm_offset);
-    }
-    const u32 shift{static_cast<u32>(std::countr_zero(element_size))};
-    const Id index{ctx.Def(offset)};
-    if (shift == 0) {
-        return index;
-    }
-    const Id shift_id{ctx.Const(shift)};
-    return ctx.OpShiftRightLogical(ctx.U32[1], index, shift_id);
-}
-
 Id StoragePointer(EmitContext& ctx, const StorageTypeDefinition& type_def,
                  Id StorageDefinitions::*member_ptr, const IR::Value& binding,
                  const IR::Value& offset, size_t element_size) {
    if (!binding.IsImmediate()) {
        throw NotImplementedException("Dynamic storage buffer indexing");
    }
-    const Id ssbo{ctx.ssbos[binding.U32()].*member_ptr};
-    const Id index{StorageIndex(ctx, offset, element_size)};
-    return ctx.OpAccessChain(type_def.element, ssbo, ctx.u32_zero_value, index);
+    return ctx.StoragePointer(binding.U32(), ctx.Def(offset), type_def, static_cast<u32>(element_size), member_ptr);
 }

 std::pair<Id, Id> AtomicArgs(EmitContext& ctx) {
@@ -216,16 +198,14 @@ Id EmitStorageAtomicUMax32(EmitContext& ctx, const IR::Value& binding, const IR:

 Id EmitStorageAtomicInc32(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                          Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    return ctx.OpFunctionCall(ctx.U32[1], ctx.increment_cas_ssbo, base_index, value, ssbo);
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    return ctx.OpFunctionCall(ctx.U32[1], ctx.increment_cas_ssbo, pointer, value);
 }

 Id EmitStorageAtomicDec32(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                          Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    return ctx.OpFunctionCall(ctx.U32[1], ctx.decrement_cas_ssbo, base_index, value, ssbo);
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    return ctx.OpFunctionCall(ctx.U32[1], ctx.decrement_cas_ssbo, pointer, value);
 }

 Id EmitStorageAtomicAnd32(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
@@ -364,56 +344,49 @@ Id EmitStorageAtomicExchange32x2(EmitContext& ctx, const IR::Value& binding,

 Id EmitStorageAtomicAddF32(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                           Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    return ctx.OpFunctionCall(ctx.F32[1], ctx.f32_add_cas, base_index, value, ssbo);
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    return ctx.OpFunctionCall(ctx.F32[1], ctx.f32_add_cas, pointer, value);
 }

 Id EmitStorageAtomicAddF16x2(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                             Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    const Id result{ctx.OpFunctionCall(ctx.F16[2], ctx.f16x2_add_cas, base_index, value, ssbo)};
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    const Id result{ctx.OpFunctionCall(ctx.F16[2], ctx.f16x2_add_cas, pointer, value)};
    return ctx.OpBitcast(ctx.U32[1], result);
 }

 Id EmitStorageAtomicAddF32x2(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                             Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    const Id result{ctx.OpFunctionCall(ctx.F32[2], ctx.f32x2_add_cas, base_index, value, ssbo)};
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    const Id result{ctx.OpFunctionCall(ctx.F32[2], ctx.f32x2_add_cas, pointer, value)};
    return ctx.OpPackHalf2x16(ctx.U32[1], result);
 }

 Id EmitStorageAtomicMinF16x2(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                             Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    const Id result{ctx.OpFunctionCall(ctx.F16[2], ctx.f16x2_min_cas, base_index, value, ssbo)};
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    const Id result{ctx.OpFunctionCall(ctx.F16[2], ctx.f16x2_min_cas, pointer, value)};
    return ctx.OpBitcast(ctx.U32[1], result);
 }

 Id EmitStorageAtomicMinF32x2(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                             Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    const Id result{ctx.OpFunctionCall(ctx.F32[2], ctx.f32x2_min_cas, base_index, value, ssbo)};
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    const Id result{ctx.OpFunctionCall(ctx.F32[2], ctx.f32x2_min_cas, pointer, value)};
    return ctx.OpPackHalf2x16(ctx.U32[1], result);
 }

 Id EmitStorageAtomicMaxF16x2(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                             Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    const Id result{ctx.OpFunctionCall(ctx.F16[2], ctx.f16x2_max_cas, base_index, value, ssbo)};
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    const Id result{ctx.OpFunctionCall(ctx.F16[2], ctx.f16x2_max_cas, pointer, value)};
    return ctx.OpBitcast(ctx.U32[1], result);
 }

 Id EmitStorageAtomicMaxF32x2(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                             Id value) {
-    const Id ssbo{ctx.ssbos[binding.U32()].U32};
-    const Id base_index{StorageIndex(ctx, offset, sizeof(u32))};
-    const Id result{ctx.OpFunctionCall(ctx.F32[2], ctx.f32x2_max_cas, base_index, value, ssbo)};
+    const Id pointer{StoragePointer(ctx, ctx.storage_types.U32, &StorageDefinitions::U32, binding, offset, sizeof(u32))};
+    const Id result{ctx.OpFunctionCall(ctx.F32[2], ctx.f32x2_max_cas, pointer, value)};
    return ctx.OpPackHalf2x16(ctx.U32[1], result);
 }

@@ -4,46 +4,33 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <bit>
-
 #include "shader_recompiler/backend/spirv/emit_spirv.h"
 #include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
 #include "shader_recompiler/backend/spirv/spirv_emit_context.h"

 namespace Shader::Backend::SPIRV {
 namespace {
-Id StorageIndex(EmitContext& ctx, const IR::Value& offset, size_t element_size,
-                u32 index_offset = 0) {
-    if (offset.IsImmediate()) {
-        const u32 imm_offset{static_cast<u32>(offset.U32() / element_size) + index_offset};
-        return ctx.Const(imm_offset);
-    }
-    const u32 shift{static_cast<u32>(std::countr_zero(element_size))};
-    Id index{ctx.Def(offset)};
-    if (shift != 0) {
-        const Id shift_id{ctx.Const(shift)};
-        index = ctx.OpShiftRightLogical(ctx.U32[1], index, shift_id);
-    }
+Id StorageByteOffset(EmitContext& ctx, const IR::Value& offset, size_t element_size, u32 index_offset) {
+    Id byte_offset{ctx.Def(offset)};
    if (index_offset != 0) {
-        index = ctx.OpIAdd(ctx.U32[1], index, ctx.Const(index_offset));
+        byte_offset = ctx.OpIAdd(ctx.U32[1], byte_offset, ctx.Const(static_cast<u32>(index_offset * element_size)));
    }
-    return index;
+    return byte_offset;
 }

 Id StoragePointer(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                  const StorageTypeDefinition& type_def, size_t element_size,
-                  Id StorageDefinitions::*member_ptr, u32 index_offset = 0) {
+                  Id StorageDefinitions::* member_ptr, u32 index_offset = 0) {
    if (!binding.IsImmediate()) {
        throw NotImplementedException("Dynamic storage buffer indexing");
    }
-    const Id ssbo{ctx.ssbos[binding.U32()].*member_ptr};
-    const Id index{StorageIndex(ctx, offset, element_size, index_offset)};
-    return ctx.OpAccessChain(type_def.element, ssbo, ctx.u32_zero_value, index);
+    const Id byte_offset{StorageByteOffset(ctx, offset, element_size, index_offset)};
+    return ctx.StoragePointer(binding.U32(), byte_offset, type_def, static_cast<u32>(element_size), member_ptr);
 }

 Id LoadStorage(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset, Id result_type,
               const StorageTypeDefinition& type_def, size_t element_size,
-               Id StorageDefinitions::*member_ptr, u32 index_offset = 0) {
+               Id StorageDefinitions::* member_ptr, u32 index_offset = 0) {
    const Id pointer{
        StoragePointer(ctx, binding, offset, type_def, element_size, member_ptr, index_offset)};
    return ctx.OpLoad(result_type, pointer);
@@ -57,7 +44,7 @@ Id LoadStorage32(EmitContext& ctx, const IR::Value& binding, const IR::Value& of

 void WriteStorage(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset, Id value,
                  const StorageTypeDefinition& type_def, size_t element_size,
-                  Id StorageDefinitions::*member_ptr, u32 index_offset = 0) {
+                  Id StorageDefinitions::* member_ptr, u32 index_offset = 0) {
    const Id pointer{
        StoragePointer(ctx, binding, offset, type_def, element_size, member_ptr, index_offset)};
    ctx.OpStore(pointer, value);
@@ -299,7 +299,7 @@ void DefineConstBuffers(EmitContext& ctx, const Info& info, Id UniformDefinition
 }

 void DefineSsbos(EmitContext& ctx, StorageTypeDefinition& type_def,
-                 Id StorageDefinitions::*member_type, const Info& info, u32 binding, Id type,
+                 Id StorageDefinitions::* member_type, const Info& info, u32 binding, Id type,
                 u32 stride) {
    const Id array_type{ctx.TypeRuntimeArray(type)};
    ctx.Decorate(array_type, spv::Decoration::ArrayStride, stride);
@@ -309,23 +309,27 @@ void DefineSsbos(EmitContext& ctx, StorageTypeDefinition& type_def,
    ctx.MemberDecorate(struct_type, 0, spv::Decoration::Offset, 0U);

    const Id struct_pointer{ctx.TypePointer(spv::StorageClass::StorageBuffer, struct_type)};
-    type_def.array = struct_pointer;
    type_def.element = ctx.TypePointer(spv::StorageClass::StorageBuffer, type);

    u32 index{};
    for (const StorageBufferDescriptor& desc : info.storage_buffers_descriptors) {
-        const Id id{ctx.AddGlobalVariable(struct_pointer, spv::StorageClass::StorageBuffer)};
+        const Id variable_type{[&] {
+            if (desc.count == 1) {
+                return struct_pointer;
+            }
+            const Id descriptor_array{ctx.TypeArray(struct_type, ctx.Const(desc.count))};
+            return ctx.TypePointer(spv::StorageClass::StorageBuffer, descriptor_array);
+        }()};
+        const Id id{ctx.AddGlobalVariable(variable_type, spv::StorageClass::StorageBuffer)};
        ctx.Decorate(id, spv::Decoration::Binding, binding);
        ctx.Decorate(id, spv::Decoration::DescriptorSet, 0U);
        ctx.Name(id, fmt::format("ssbo{}", index));
        if (ctx.profile.supported_spirv >= 0x00010400) {
            ctx.interfaces.push_back(id);
        }
-        for (size_t i = 0; i < desc.count; ++i) {
-            ctx.ssbos[index + i].*member_type = id;
-        }
-        index += desc.count;
-        binding += desc.count;
+        ctx.ssbos[index].*member_type = id;
+        ++index;
+        ++binding;
    }
 }

@@ -368,8 +372,7 @@ Id CasFunction(EmitContext& ctx, Operation operation, Id value_type) {
    return func;
 }

-Id CasLoop(EmitContext& ctx, Operation operation, Id array_pointer, Id element_pointer,
-           Id value_type, Id memory_type, spv::Scope scope) {
+Id CasLoop(EmitContext& ctx, Operation operation, Id element_pointer, Id value_type, Id memory_type, spv::Scope scope) {
    const bool is_shared{scope == spv::Scope::Workgroup};
    const bool is_struct{!is_shared || ctx.uses_explicit_workgroup_layout};
    const Id cas_func{CasFunction(ctx, operation, value_type)};
@@ -379,14 +382,12 @@ Id CasLoop(EmitContext& ctx, Operation operation, Id array_pointer, Id element_p
    const Id loop_header{ctx.OpLabel()};
    const Id continue_block{ctx.OpLabel()};
    const Id merge_block{ctx.OpLabel()};
-    const Id func_type{is_shared
-                           ? ctx.TypeFunction(value_type, ctx.U32[1], value_type)
-                           : ctx.TypeFunction(value_type, ctx.U32[1], value_type, array_pointer)};
+    const Id func_type{is_shared ? ctx.TypeFunction(value_type, ctx.U32[1], value_type)
+                                 : ctx.TypeFunction(value_type, element_pointer, value_type)};

    const Id func{ctx.OpFunction(value_type, spv::FunctionControlMask::MaskNone, func_type)};
-    const Id index{ctx.OpFunctionParameter(ctx.U32[1])};
+    const Id address{ctx.OpFunctionParameter(is_shared ? ctx.U32[1] : element_pointer)};
    const Id op_b{ctx.OpFunctionParameter(value_type)};
-    const Id base{is_shared ? ctx.shared_memory_u32 : ctx.OpFunctionParameter(array_pointer)};
    ctx.AddLabel();
    ctx.OpBranch(loop_header);
    ctx.AddLabel(loop_header);
@@ -395,8 +396,13 @@ Id CasLoop(EmitContext& ctx, Operation operation, Id array_pointer, Id element_p
    ctx.OpBranch(continue_block);

    ctx.AddLabel(continue_block);
-    const Id word_pointer{is_struct ? ctx.OpAccessChain(element_pointer, base, zero, index)
-                                    : ctx.OpAccessChain(element_pointer, base, index)};
+    const Id word_pointer{[&] {
+        if (!is_shared) {
+            return address;
+        }
+        return is_struct ? ctx.OpAccessChain(element_pointer, ctx.shared_memory_u32, zero, address)
+                         : ctx.OpAccessChain(element_pointer, ctx.shared_memory_u32, address);
+    }()};
    if (value_type.value == ctx.F32[2].value) {
        const Id u32_value{ctx.OpLoad(ctx.U32[1], word_pointer)};
        const Id value{ctx.OpUnpackHalf2x16(ctx.F32[2], u32_value)};
@@ -480,6 +486,7 @@ EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_inf
    DefineSharedMemoryFunctions(program);
    DefineConstantBuffers(program.info, uniform_binding);
    DefineConstantBufferIndirectFunctions(program.info);
+    DefineStorageBufferMappings(program.info, storage_binding);
    DefineStorageBuffers(program.info, storage_binding);
    DefineTextureBuffers(program.info, texture_binding);
    DefineImageBuffers(program.info, image_binding);
@@ -532,6 +539,36 @@ Id EmitContext::BitOffset16(const IR::Value& offset) {
    return OpBitwiseAnd(U32[1], OpShiftLeftLogical(U32[1], Def(offset), Const(3u)), Const(16u));
 }

+Id EmitContext::StoragePointer(u32 binding, Id byte_offset, const StorageTypeDefinition& type_def,
+                               u32 element_size, Id StorageDefinitions::* member_ptr) {
+    const Id ssbo{ssbos[binding].*member_ptr};
+    const u32 segment_count{storage_buffer_mapping_counts[binding]};
+    if (segment_count <= 1) {
+        const Id index{
+            element_size == 1
+                ? byte_offset
+                : OpShiftRightLogical(U32[1], byte_offset, Const(static_cast<u32>(std::countr_zero(element_size))))};
+        return OpAccessChain(type_def.element, ssbo, u32_zero_value, index);
+    }
+
+    const Id mapped{OpFunctionCall(U32[2], storage_buffer_map_func,
+                                   Const(storage_buffer_mapping_bases[binding]),
+                                   Const(segment_count), byte_offset)};
+    const Id segment{OpCompositeExtract(U32[1], mapped, 0U)};
+    const Id local_offset{OpCompositeExtract(U32[1], mapped, 1U)};
+    const Id index{
+        element_size == 1
+            ? local_offset
+            : OpShiftRightLogical(U32[1], local_offset, Const(static_cast<u32>(std::countr_zero(element_size))))};
+    Decorate(segment, spv::Decoration::NonUniform);
+    non_uniform_ids.insert(segment.value);
+    const Id pointer{OpAccessChain(type_def.element, ssbo, segment, u32_zero_value, index)};
+    Decorate(pointer, spv::Decoration::NonUniform);
+    non_uniform_ids.insert(pointer.value);
+    uses_nonuniform_storage_buffer = true;
+    return pointer;
+}
+
 void EmitContext::DefineCommonTypes(const Info& info) {
    void_id = TypeVoid();

@@ -696,12 +733,10 @@ void EmitContext::DefineSharedMemory(const IR::Program& program) {

 void EmitContext::DefineSharedMemoryFunctions(const IR::Program& program) {
    if (program.info.uses_shared_increment) {
-        increment_cas_shared = CasLoop(*this, Operation::Increment, shared_memory_u32_type,
-                                       shared_u32, U32[1], U32[1], spv::Scope::Workgroup);
+        increment_cas_shared = CasLoop(*this, Operation::Increment, shared_u32, U32[1], U32[1], spv::Scope::Workgroup);
    }
    if (program.info.uses_shared_decrement) {
-        decrement_cas_shared = CasLoop(*this, Operation::Decrement, shared_memory_u32_type,
-                                       shared_u32, U32[1], U32[1], spv::Scope::Workgroup);
+        decrement_cas_shared = CasLoop(*this, Operation::Decrement, shared_u32, U32[1], U32[1], spv::Scope::Workgroup);
    }
 }

@@ -945,8 +980,7 @@ void EmitContext::DefineGlobalMemoryFunctions(const Info& info) {
    }
    using DefPtr = Id StorageDefinitions::*;
    const Id zero{u32_zero_value};
-    const auto define_body{[&](DefPtr ssbo_member, Id addr, Id element_pointer, u32 shift,
-                               auto&& callback) {
+    const auto define_body{[&](DefPtr ssbo_member, Id addr, const StorageTypeDefinition& type_def, u32 shift, auto&& callback) {
        AddLabel();
        const size_t num_buffers{info.storage_buffers_descriptors.size()};
        for (size_t index = 0; index < num_buffers; ++index) {
@@ -973,30 +1007,28 @@ void EmitContext::DefineGlobalMemoryFunctions(const Info& info) {
            OpSelectionMerge(else_label, spv::SelectionControlMask::MaskNone);
            OpBranchConditional(cond, then_label, else_label);
            AddLabel(then_label);
-            const Id ssbo_id{ssbos[index].*ssbo_member};
            const Id ssbo_offset{OpUConvert(U32[1], OpISub(U64, addr, ssbo_addr))};
-            const Id ssbo_index{OpShiftRightLogical(U32[1], ssbo_offset, Const(shift))};
-            const Id ssbo_pointer{OpAccessChain(element_pointer, ssbo_id, zero, ssbo_index)};
+            const Id ssbo_pointer{StoragePointer(static_cast<u32>(index), ssbo_offset, type_def, 1U << shift, ssbo_member)};
            callback(ssbo_pointer);
            AddLabel(else_label);
        }
    }};
-    const auto define_load{[&](DefPtr ssbo_member, Id element_pointer, Id type, u32 shift) {
-        const Id function_type{TypeFunction(type, U64)};
-        const Id func_id{OpFunction(type, spv::FunctionControlMask::MaskNone, function_type)};
-        const Id addr{OpFunctionParameter(U64)};
-        define_body(ssbo_member, addr, element_pointer, shift,
-                    [&](Id ssbo_pointer) { OpReturnValue(OpLoad(type, ssbo_pointer)); });
-        OpReturnValue(ConstantNull(type));
-        OpFunctionEnd();
-        return func_id;
-    }};
-    const auto define_write{[&](DefPtr ssbo_member, Id element_pointer, Id type, u32 shift) {
+    const auto define_load{
+        [&](DefPtr ssbo_member, const StorageTypeDefinition& type_def, Id type, u32 shift) {
+            const Id function_type{TypeFunction(type, U64)};
+            const Id func_id{OpFunction(type, spv::FunctionControlMask::MaskNone, function_type)};
+            const Id addr{OpFunctionParameter(U64)};
+            define_body(ssbo_member, addr, type_def, shift, [&](Id ssbo_pointer) { OpReturnValue(OpLoad(type, ssbo_pointer)); });
+            OpReturnValue(ConstantNull(type));
+            OpFunctionEnd();
+            return func_id;
+        }};
+    const auto define_write{[&](DefPtr ssbo_member, const StorageTypeDefinition& type_def, Id type, u32 shift) {
        const Id function_type{TypeFunction(void_id, U64, type)};
        const Id func_id{OpFunction(void_id, spv::FunctionControlMask::MaskNone, function_type)};
        const Id addr{OpFunctionParameter(U64)};
        const Id data{OpFunctionParameter(type)};
-        define_body(ssbo_member, addr, element_pointer, shift, [&](Id ssbo_pointer) {
+        define_body(ssbo_member, addr, type_def, shift, [&](Id ssbo_pointer) {
            OpStore(ssbo_pointer, data);
            OpReturn();
        });
@@ -1006,10 +1038,9 @@ void EmitContext::DefineGlobalMemoryFunctions(const Info& info) {
    }};
    const auto define{
        [&](DefPtr ssbo_member, const StorageTypeDefinition& type_def, Id type, size_t size) {
-            const Id element_type{type_def.element};
            const u32 shift{static_cast<u32>(std::countr_zero(size))};
-            const Id load_func{define_load(ssbo_member, element_type, type, shift)};
-            const Id write_func{define_write(ssbo_member, element_type, type, shift)};
+            const Id load_func{define_load(ssbo_member, type_def, type, shift)};
+            const Id write_func{define_write(ssbo_member, type_def, type, shift)};
            return std::make_pair(load_func, write_func);
        }};
    std::tie(load_global_func_u32, write_global_func_u32) =
@@ -1228,6 +1259,79 @@ void EmitContext::DefineConstantBufferIndirectFunctions(const Info& info) {
    }
 }

+void EmitContext::DefineStorageBufferMappings(const Info& info, u32& binding) {
+    if (!UsesStorageBufferMappings(info)) {
+        return;
+    }
+    ASSERT(profile.support_storage_buffer_array_nonuniform_indexing);
+    AddExtension("SPV_KHR_storage_buffer_storage_class");
+
+    const u32 num_entries{NumDescriptors(info.storage_buffers_descriptors)};
+    const Id array_type{TypeArray(U32[1], Const(num_entries))};
+    Decorate(array_type, spv::Decoration::ArrayStride, sizeof(u32));
+    const Id struct_type{TypeStruct(array_type)};
+    Decorate(struct_type, spv::Decoration::Block);
+    MemberName(struct_type, 0, "segment_sizes");
+    MemberDecorate(struct_type, 0, spv::Decoration::Offset, 0U);
+    const Id pointer_type{TypePointer(spv::StorageClass::StorageBuffer, struct_type)};
+    storage_buffer_mapping_u32 = TypePointer(spv::StorageClass::StorageBuffer, U32[1]);
+    storage_buffer_mapping = AddGlobalVariable(pointer_type, spv::StorageClass::StorageBuffer);
+    Decorate(storage_buffer_mapping, spv::Decoration::Binding, binding++);
+    Decorate(storage_buffer_mapping, spv::Decoration::DescriptorSet, 0U);
+    Name(storage_buffer_mapping, "storage_buffer_mapping");
+    //Starting with version 1.4... (https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html)
+    if (profile.supported_spirv >= 0x00010400) {
+        interfaces.push_back(storage_buffer_mapping);
+    }
+
+    u32 mapping_base{};
+    for (u32 index = 0; index < info.storage_buffers_descriptors.size(); ++index) {
+        const StorageBufferDescriptor& desc = info.storage_buffers_descriptors[index];
+        storage_buffer_mapping_bases[index] = mapping_base;
+        storage_buffer_mapping_counts[index] = desc.count;
+        mapping_base += desc.count;
+    }
+
+    const Id function_type{TypeFunction(U32[2], U32[1], U32[1], U32[1])};
+    storage_buffer_map_func = OpFunction(U32[2], spv::FunctionControlMask::MaskNone, function_type);
+    const Id base{OpFunctionParameter(U32[1])};
+    const Id count{OpFunctionParameter(U32[1])};
+    const Id byte_offset{OpFunctionParameter(U32[1])};
+    const Id index_pointer_type{TypePointer(spv::StorageClass::Function, U32[1])};
+    const Id loop_header{OpLabel()};
+    const Id continue_block{OpLabel()};
+    const Id merge_block{OpLabel()};
+    AddLabel();
+    const Id segment_var{AddLocalVariable(index_pointer_type, spv::StorageClass::Function)};
+    const Id offset_var{AddLocalVariable(index_pointer_type, spv::StorageClass::Function)};
+    OpStore(segment_var, u32_zero_value);
+    OpStore(offset_var, byte_offset);
+    OpBranch(loop_header);
+
+    AddLabel(loop_header);
+    const Id segment{OpLoad(U32[1], segment_var)};
+    const Id local_offset{OpLoad(U32[1], offset_var)};
+    const Id mapping_index{OpIAdd(U32[1], base, segment)};
+    const Id size_pointer{OpAccessChain(storage_buffer_mapping_u32, storage_buffer_mapping, u32_zero_value, mapping_index)};
+    const Id segment_size{OpLoad(U32[1], size_pointer)};
+    const Id fits{OpULessThan(U1, local_offset, segment_size)};
+    const Id last_segment{OpISub(U32[1], count, Const(1U))};
+    const Id is_last{OpIEqual(U1, segment, last_segment)};
+    const Id found{OpLogicalOr(U1, fits, is_last)};
+    OpLoopMerge(merge_block, continue_block, spv::LoopControlMask::MaskNone);
+    OpBranchConditional(found, merge_block, continue_block);
+
+    AddLabel(continue_block);
+    OpStore(offset_var, OpISub(U32[1], local_offset, segment_size));
+    OpStore(segment_var, OpIAdd(U32[1], segment, Const(1U)));
+    OpBranch(loop_header);
+
+    AddLabel(merge_block);
+    OpReturnValue(OpCompositeConstruct(U32[2], segment, local_offset));
+    OpFunctionEnd();
+    Name(storage_buffer_map_func, "map_storage_buffer");
+}
+
 void EmitContext::DefineStorageBuffers(const Info& info, u32& binding) {
    if (info.storage_buffers_descriptors.empty()) {
        return;
@@ -1271,9 +1375,7 @@ void EmitContext::DefineStorageBuffers(const Info& info, u32& binding) {
        DefineSsbos(*this, storage_types.U32x4, &StorageDefinitions::U32x4, info, binding, U32[4],
                    sizeof(u32[4]));
    }
-    for (const StorageBufferDescriptor& desc : info.storage_buffers_descriptors) {
-        binding += desc.count;
-    }
+    binding += static_cast<u32>(info.storage_buffers_descriptors.size());
    const bool needs_function{
        info.uses_global_increment || info.uses_global_decrement || info.uses_atomic_f32_add ||
        info.uses_atomic_f16x2_add || info.uses_atomic_f16x2_min || info.uses_atomic_f16x2_max ||
@@ -1282,40 +1384,31 @@ void EmitContext::DefineStorageBuffers(const Info& info, u32& binding) {
        AddCapability(spv::Capability::VariablePointersStorageBuffer);
    }
    if (info.uses_global_increment) {
-        increment_cas_ssbo = CasLoop(*this, Operation::Increment, storage_types.U32.array,
-                                     storage_types.U32.element, U32[1], U32[1], spv::Scope::Device);
+        increment_cas_ssbo = CasLoop(*this, Operation::Increment, storage_types.U32.element, U32[1], U32[1], spv::Scope::Device);
    }
    if (info.uses_global_decrement) {
-        decrement_cas_ssbo = CasLoop(*this, Operation::Decrement, storage_types.U32.array,
-                                     storage_types.U32.element, U32[1], U32[1], spv::Scope::Device);
+        decrement_cas_ssbo = CasLoop(*this, Operation::Decrement, storage_types.U32.element, U32[1], U32[1], spv::Scope::Device);
    }
    if (info.uses_atomic_f32_add) {
-        f32_add_cas = CasLoop(*this, Operation::FPAdd, storage_types.U32.array,
-                              storage_types.U32.element, F32[1], U32[1], spv::Scope::Device);
+        f32_add_cas = CasLoop(*this, Operation::FPAdd, storage_types.U32.element, F32[1], U32[1], spv::Scope::Device);
    }
    if (info.uses_atomic_f16x2_add) {
-        f16x2_add_cas = CasLoop(*this, Operation::FPAdd, storage_types.U32.array,
-                                storage_types.U32.element, F16[2], F16[2], spv::Scope::Device);
+        f16x2_add_cas = CasLoop(*this, Operation::FPAdd, storage_types.U32.element, F16[2], F16[2], spv::Scope::Device);
    }
    if (info.uses_atomic_f16x2_min) {
-        f16x2_min_cas = CasLoop(*this, Operation::FPMin, storage_types.U32.array,
-                                storage_types.U32.element, F16[2], F16[2], spv::Scope::Device);
+        f16x2_min_cas = CasLoop(*this, Operation::FPMin, storage_types.U32.element, F16[2], F16[2], spv::Scope::Device);
    }
    if (info.uses_atomic_f16x2_max) {
-        f16x2_max_cas = CasLoop(*this, Operation::FPMax, storage_types.U32.array,
-                                storage_types.U32.element, F16[2], F16[2], spv::Scope::Device);
+        f16x2_max_cas = CasLoop(*this, Operation::FPMax, storage_types.U32.element, F16[2], F16[2], spv::Scope::Device);
    }
    if (info.uses_atomic_f32x2_add) {
-        f32x2_add_cas = CasLoop(*this, Operation::FPAdd, storage_types.U32.array,
-                                storage_types.U32.element, F32[2], F32[2], spv::Scope::Device);
+        f32x2_add_cas = CasLoop(*this, Operation::FPAdd, storage_types.U32.element, F32[2], F32[2], spv::Scope::Device);
    }
    if (info.uses_atomic_f32x2_min) {
-        f32x2_min_cas = CasLoop(*this, Operation::FPMin, storage_types.U32.array,
-                                storage_types.U32.element, F32[2], F32[2], spv::Scope::Device);
+        f32x2_min_cas = CasLoop(*this, Operation::FPMin, storage_types.U32.element, F32[2], F32[2], spv::Scope::Device);
    }
    if (info.uses_atomic_f32x2_max) {
-        f32x2_max_cas = CasLoop(*this, Operation::FPMax, storage_types.U32.array,
-                                storage_types.U32.element, F32[2], F32[2], spv::Scope::Device);
+        f32x2_max_cas = CasLoop(*this, Operation::FPMax, storage_types.U32.element, F32[2], F32[2], spv::Scope::Device);
    }
 }

@@ -114,7 +114,6 @@ struct UniformDefinitions {
 };

 struct StorageTypeDefinition {
-    Id array{};
    Id element{};
 };

@@ -173,6 +172,8 @@ public:
    [[nodiscard]] Id BitOffset8(const IR::Value& offset);
    [[nodiscard]] Id BitOffset16(const IR::Value& offset);

+    [[nodiscard]] Id StoragePointer(u32 binding, Id byte_offset, const StorageTypeDefinition& type_def, u32 element_size, Id StorageDefinitions::*member_ptr);
+
    Id Const(u32 value) {
        return Constant(U32[1], value);
    }
@@ -257,6 +258,11 @@ public:

    std::array<UniformDefinitions, Info::MAX_CBUFS> cbufs{};
    std::array<StorageDefinitions, Info::MAX_SSBOS> ssbos{};
+    std::array<u32, Info::MAX_SSBOS> storage_buffer_mapping_bases{};
+    std::array<u32, Info::MAX_SSBOS> storage_buffer_mapping_counts{};
+    Id storage_buffer_mapping{};
+    Id storage_buffer_mapping_u32{};
+    Id storage_buffer_map_func{};
    std::vector<TextureBufferDefinition> texture_buffers;
    std::vector<ImageBufferDefinition> image_buffers;
    std::vector<TextureDefinition> textures;
@@ -376,6 +382,7 @@ public:
    bool uses_nonuniform_storage_image{};
    bool uses_nonuniform_uniform_texel_buffer{};
    bool uses_nonuniform_storage_texel_buffer{};
+    bool uses_nonuniform_storage_buffer{};

 private:
    void DefineCommonTypes(const Info& info);
@@ -386,6 +393,7 @@ private:
    void DefineSharedMemoryFunctions(const IR::Program& program);
    void DefineConstantBuffers(const Info& info, u32& binding);
    void DefineConstantBufferIndirectFunctions(const Info& info);
+    void DefineStorageBufferMappings(const Info& info, u32& binding);
    void DefineStorageBuffers(const Info& info, u32& binding);
    void DefineTextureBuffers(const Info& info, u32& binding);
    void DefineImageBuffers(const Info& info, u32& binding);
@@ -132,6 +132,14 @@ void AddNVNStorageBuffers(IR::Program& program) {
    }
 }

+void ConfigureStorageBufferMappings(IR::Program& program, const HostTranslateInfo& host_info) {
+    // https://docs.vulkan.org/guide/latest/descriptor_arrays.html
+    // will be needed: descriptor array elements represent physical spans of one guest virtual buffer.
+    for (StorageBufferDescriptor& desc : program.info.storage_buffers_descriptors) {
+        desc.count = host_info.storage_buffer_segment_count;
+    }
+}
+
 using IR::IsLegacyAttribute; //rescoped to attribute.h to make it visible in load_store_attribute.cpp IPA

 std::map<IR::Attribute, IR::Attribute> GenerateLegacyToGenericMappings(
@@ -299,6 +307,7 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo
    Optimization::PositionPass(env, program);

    Optimization::GlobalMemoryToStorageBufferPass(program, normalized_host_info);
+    ConfigureStorageBufferMappings(program, normalized_host_info);
    Optimization::TexturePass(env, program, normalized_host_info);

    if (Settings::values.resolution_info.active || Settings::values.rescale_hack.GetValue()) {
@@ -314,6 +323,7 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo

    CollectInterpolationInfo(env, program);
    AddNVNStorageBuffers(program);
+    ConfigureStorageBufferMappings(program, normalized_host_info);
    return program;
 }

@@ -6,6 +6,7 @@

 #pragma once

+#include <algorithm>
 #include "common/common_types.h"

 namespace Shader {
@@ -19,6 +20,7 @@ struct HostTranslateInfo {

    u64 min_ssbo_alignment{};            ///< Minimum alignment supported by the device for SSBOs
    u32 max_per_stage_descriptor_sampled_images{}; ///< maximum sampled descriptors per stage
+    u32 max_per_stage_descriptor_storage_buffers{}; ///< maximum storage descriptors per stage
    u32 max_per_stage_resources{};                 ///< maximum resources per stage
    u32 max_descriptor_set_samplers{};
    u32 max_descriptor_set_uniform_buffers{};
@@ -38,12 +40,14 @@ struct HostTranslateInfo {
                                                ///< passthrough shaders
    bool support_conditional_barrier{}; ///< True when the device supports barriers in conditional
                                        ///< control flow
+    u32 storage_buffer_segment_count{1}; ///< Physical ranges available to each guest SSBO

    void ApplyDescriptorLimitPolicy() noexcept {
        if (min_ssbo_alignment == 0) {
            min_ssbo_alignment = 1;
        }
        ApplyDescriptorLimitFallback(max_per_stage_descriptor_sampled_images);
+        ApplyDescriptorLimitFallback(max_per_stage_descriptor_storage_buffers);
        ApplyDescriptorLimitFallback(max_per_stage_resources);
        ApplyDescriptorLimitFallback(max_descriptor_set_samplers);
        ApplyDescriptorLimitFallback(max_descriptor_set_uniform_buffers);
@@ -53,6 +57,7 @@ struct HostTranslateInfo {
        ApplyDescriptorLimitFallback(max_descriptor_set_sampled_images);
        ApplyDescriptorLimitFallback(max_descriptor_set_storage_images);
        ApplyDescriptorLimitFallback(max_descriptor_set_input_attachements);
+        storage_buffer_segment_count = (std::max)(storage_buffer_segment_count, 1U);
    }

 private:
@@ -64,6 +64,7 @@ struct Profile {
    bool support_storage_image_array_nonuniform_indexing{};
    bool support_uniform_texel_buffer_array_nonuniform_indexing{};
    bool support_storage_texel_buffer_array_nonuniform_indexing{};
+    bool support_storage_buffer_array_nonuniform_indexing{};

    bool warp_size_potentially_larger_than_guest{};

@@ -6,6 +6,7 @@

 #pragma once

+#include <algorithm>
 #include <array>
 #include <bitset>
 #include <map>
@@ -340,6 +341,10 @@ struct Info {
    ImageDescriptors image_descriptors;
 };

+[[nodiscard]] inline bool UsesStorageBufferMappings(const Info& info) noexcept {
+    return std::ranges::any_of(info.storage_buffers_descriptors, [](const auto& desc) { return desc.count > 1; });
+}
+
 template <typename Descriptors>
 u32 NumDescriptors(const Descriptors& descriptors) {
    u32 num{};
@@ -7,6 +7,8 @@
 #pragma once

 #include <algorithm>
+#include <cstring>
+#include <limits>
 #include <memory>
 #include <numeric>

@@ -423,7 +425,7 @@ void BufferCache<P>::UnbindGraphicsStorageBuffers(size_t stage) {

 template <class P>
 bool BufferCache<P>::BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index, u32 cbuf_index,
-                                               u32 cbuf_offset, bool is_written) {
+                                               u32 cbuf_offset, bool is_written, u32 descriptor_count) {
    const bool already_enabled =
        ((channel_state->enabled_storage_buffers[stage] >> ssbo_index) & 1U) != 0;
    if constexpr (requires { runtime.ShouldLimitDynamicStorageBuffers(); }) {
@@ -448,8 +450,8 @@ bool BufferCache<P>::BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index,
    const auto& cbufs = maxwell3d->state.shader_stages[stage];
    const GPUVAddr ssbo_addr = cbufs.const_buffers[cbuf_index].address + cbuf_offset;
    channel_state->storage_buffers[stage][ssbo_index] =
-        StorageBufferBinding(ssbo_addr, cbuf_index, is_written);
-    return (channel_state->storage_buffers[stage][ssbo_index].buffer_id != NULL_BUFFER_ID);
+        StorageBufferBinding(ssbo_addr, cbuf_index, is_written, descriptor_count);
+    return channel_state->storage_buffers[stage][ssbo_index].gpu_addr != 0;
 }

 template <class P>
@@ -487,7 +489,7 @@ void BufferCache<P>::UnbindComputeStorageBuffers() {

 template <class P>
 void BufferCache<P>::BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset,
-                                              bool is_written) {
+                                              bool is_written, u32 descriptor_count) {
    if (ssbo_index >= channel_state->compute_storage_buffers.size()) [[unlikely]] {
        LOG_ERROR(HW_GPU, "Storage buffer index {} exceeds maximum storage buffer count",
                  ssbo_index);
@@ -524,7 +526,7 @@ void BufferCache<P>::BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index,
    const auto& cbufs = launch_desc.const_buffer_config;
    const GPUVAddr ssbo_addr = cbufs[cbuf_index].Address() + cbuf_offset;
    channel_state->compute_storage_buffers[ssbo_index] =
-        StorageBufferBinding(ssbo_addr, cbuf_index, is_written);
+        StorageBufferBinding(ssbo_addr, cbuf_index, is_written, descriptor_count);
 }

 template <class P>
@@ -1000,27 +1002,52 @@ void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32

 template <class P>
 void BufferCache<P>::BindHostGraphicsStorageBuffers(size_t stage) {
+    boost::container::small_vector<u32, NUM_STORAGE_BUFFERS> segment_sizes;
+    bool uses_mapping{};
+    ForEachEnabledBit(channel_state->enabled_storage_buffers[stage], [&](u32 index) {
+        const StorageBufferBindingInfo& binding = channel_state->storage_buffers[stage][index];
+        uses_mapping |= binding.descriptor_count > 1;
+        for (u32 segment = 0; segment < binding.descriptor_count; ++segment) {
+            segment_sizes.push_back(segment < binding.segments.size() ? binding.segments[segment].size : 0);
+        }
+    });
+    if (uses_mapping) {
+        const u32 mapping_size = static_cast<u32>(segment_sizes.size() * sizeof(u32));
+        if constexpr (!IS_OPENGL) {
+            const std::span<u8> mapped = runtime.BindMappedStorageBuffer(mapping_size);
+            std::memcpy(mapped.data(), segment_sizes.data(), mapping_size);
+        }
+    }
+
    u32 binding_index = 0;
    ForEachEnabledBit(channel_state->enabled_storage_buffers[stage], [&](u32 index) {
-        const Binding& binding = channel_state->storage_buffers[stage][index];
-        Buffer& buffer = slot_buffers[binding.buffer_id];
-        TouchBuffer(buffer, binding.buffer_id);
-        const u32 size = binding.size;
-        SynchronizeBuffer(buffer, binding.device_addr, size);
-
-        const u32 offset = buffer.Offset(binding.device_addr);
-        buffer.MarkUsage(offset, size);
+        const StorageBufferBindingInfo& storage = channel_state->storage_buffers[stage][index];
        const bool is_written = ((channel_state->written_storage_buffers[stage] >> index) & 1) != 0;
-
-        if (is_written) {
-            MarkWrittenBuffer(binding.buffer_id, binding.device_addr, size);
-        }
-
-        if constexpr (NEEDS_BIND_STORAGE_INDEX) {
-            runtime.BindStorageBuffer(stage, binding_index, buffer, offset, size, is_written);
-            ++binding_index;
-        } else {
-            runtime.BindStorageBuffer(buffer, offset, size, is_written);
+        for (u32 segment = 0; segment < storage.descriptor_count; ++segment) {
+            Buffer* buffer = &slot_buffers[NULL_BUFFER_ID];
+            u32 offset{};
+            u32 size{IS_OPENGL ? 0U : static_cast<u32>(sizeof(u32))};
+            const bool is_actual_segment = segment < storage.segments.size();
+            // shall be safe enough if the segment is not actual, use the last available segment or nullptr if none exist.
+            const Binding* binding = is_actual_segment ? &storage.segments[segment] : storage.segments.empty() ? nullptr : &storage.segments.back();
+            if (binding) {
+                buffer = &slot_buffers[binding->buffer_id];
+                size = binding->size;
+                offset = buffer->Offset(binding->device_addr);
+                if (is_actual_segment) {
+                    TouchBuffer(*buffer, binding->buffer_id);
+                    SynchronizeBuffer(*buffer, binding->device_addr, size);
+                    buffer->MarkUsage(offset, size);
+                    if (is_written) {
+                        MarkWrittenBuffer(binding->buffer_id, binding->device_addr, size);
+                    }
+                }
+            }
+            if constexpr (NEEDS_BIND_STORAGE_INDEX) {
+                runtime.BindStorageBuffer(stage, binding_index++, *buffer, offset, size, is_written);
+            } else {
+                runtime.BindStorageBuffer(*buffer, offset, size, is_written);
+            }
        }
    });
 }
@@ -1136,28 +1163,53 @@ void BufferCache<P>::BindHostComputeUniformBuffers() {

 template <class P>
 void BufferCache<P>::BindHostComputeStorageBuffers() {
+    boost::container::small_vector<u32, NUM_STORAGE_BUFFERS> segment_sizes;
+    bool uses_mapping{};
+    ForEachEnabledBit(channel_state->enabled_compute_storage_buffers, [&](u32 index) {
+        const StorageBufferBindingInfo& binding = channel_state->compute_storage_buffers[index];
+        uses_mapping |= binding.descriptor_count > 1;
+        for (u32 segment = 0; segment < binding.descriptor_count; ++segment) {
+            segment_sizes.push_back(segment < binding.segments.size() ? binding.segments[segment].size : 0);
+        }
+    });
+    if (uses_mapping) {
+        const u32 mapping_size = static_cast<u32>(segment_sizes.size() * sizeof(u32));
+        if constexpr (!IS_OPENGL) {
+            const std::span<u8> mapped = runtime.BindMappedStorageBuffer(mapping_size);
+            std::memcpy(mapped.data(), segment_sizes.data(), mapping_size);
+        }
+    }
+
    u32 binding_index = 0;
    ForEachEnabledBit(channel_state->enabled_compute_storage_buffers, [&](u32 index) {
-        const Binding& binding = channel_state->compute_storage_buffers[index];
-        Buffer& buffer = slot_buffers[binding.buffer_id];
-        TouchBuffer(buffer, binding.buffer_id);
-        const u32 size = binding.size;
-        SynchronizeBuffer(buffer, binding.device_addr, size);
-
-        const u32 offset = buffer.Offset(binding.device_addr);
-        buffer.MarkUsage(offset, size);
+        const StorageBufferBindingInfo& storage = channel_state->compute_storage_buffers[index];
        const bool is_written =
            ((channel_state->written_compute_storage_buffers >> index) & 1) != 0;
-
-        if (is_written) {
-            MarkWrittenBuffer(binding.buffer_id, binding.device_addr, size);
-        }
-
-        if constexpr (NEEDS_BIND_STORAGE_INDEX) {
-            runtime.BindComputeStorageBuffer(binding_index, buffer, offset, size, is_written);
-            ++binding_index;
-        } else {
-            runtime.BindStorageBuffer(buffer, offset, size, is_written);
+        for (u32 segment = 0; segment < storage.descriptor_count; ++segment) {
+            Buffer* buffer = &slot_buffers[NULL_BUFFER_ID];
+            u32 offset{};
+            u32 size{IS_OPENGL ? 0U : static_cast<u32>(sizeof(u32))};
+            const bool is_actual_segment = segment < storage.segments.size();
+            //same fallback logic
+            const Binding* binding = is_actual_segment ? &storage.segments[segment] : storage.segments.empty() ? nullptr : &storage.segments.back();
+            if (binding) {
+                buffer = &slot_buffers[binding->buffer_id];
+                size = binding->size;
+                offset = buffer->Offset(binding->device_addr);
+                if (is_actual_segment) {
+                    TouchBuffer(*buffer, binding->buffer_id);
+                    SynchronizeBuffer(*buffer, binding->device_addr, size);
+                    buffer->MarkUsage(offset, size);
+                    if (is_written) {
+                        MarkWrittenBuffer(binding->buffer_id, binding->device_addr, size);
+                    }
+                }
+            }
+            if constexpr (NEEDS_BIND_STORAGE_INDEX) {
+                runtime.BindComputeStorageBuffer(binding_index++, *buffer, offset, size, is_written);
+            } else {
+                runtime.BindStorageBuffer(*buffer, offset, size, is_written);
+            }
        }
    });
 }
@@ -1350,10 +1402,7 @@ void BufferCache<P>::UpdateUniformBuffers(size_t stage) {
 template <class P>
 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);
-        binding.buffer_id = buffer_id;
+        UpdateStorageBuffer(channel_state->storage_buffers[stage][index]);
    });
 }

@@ -1414,12 +1463,54 @@ void BufferCache<P>::UpdateComputeUniformBuffers() {
 template <class P>
 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);
+        UpdateStorageBuffer(channel_state->compute_storage_buffers[index]);
    });
 }

+template <class P>
+void BufferCache<P>::UpdateStorageBuffer(StorageBufferBindingInfo& binding) {
+    binding.segments.clear();
+    if (binding.gpu_addr == 0 || binding.size == 0) { return;}
+    if (binding.descriptor_count == 1) {
+        // for safety gotta preserve the legacy path on possible hosts without storage-buffer descriptor indexing.
+        const std::optional<DAddr> device_addr = gpu_memory->GpuToCpuAddress(binding.gpu_addr);
+        if (device_addr) {
+            binding.segments.push_back(Binding{
+                .device_addr = *device_addr,
+                .size = binding.size,
+                .buffer_id = FindBuffer(*device_addr, binding.size),
+            });
+        }
+        return;
+    }
+
+    const auto ranges = gpu_memory->GetSubmappedRange(binding.gpu_addr, binding.size);
+    const size_t mapped_size =
+        std::accumulate(ranges.begin(), ranges.end(), size_t{}, [](size_t total, const auto& range) { return total + range.second; });
+    if (mapped_size != binding.size) {
+        LOG_ERROR(HW_GPU, "Storage buffer range {:#x}+{:#x} is not fully mapped", binding.gpu_addr, binding.size);
+        return;
+    }
+    if (ranges.size() > binding.descriptor_count) {
+        LOG_ERROR(HW_GPU, "Storage buffer range {:#x}+{:#x} has {} physical segments, exceeding host capacity {}",
+                  binding.gpu_addr, binding.size, ranges.size(), binding.descriptor_count);
+        return;
+    }
+    for (const auto& [gpu_addr, size] : ranges) {
+        const std::optional<DAddr> device_addr = gpu_memory->GpuToCpuAddress(gpu_addr);
+        if (!device_addr || size > (std::numeric_limits<u32>::max)()) {
+            binding.segments.clear();
+            return;
+        }
+        const u32 segment_size = static_cast<u32>(size);
+        binding.segments.push_back(Binding{
+            .device_addr = *device_addr,
+            .size = segment_size,
+            .buffer_id = FindBuffer(*device_addr, segment_size),
+        });
+    }
+}
+
 template <class P>
 void BufferCache<P>::UpdateComputeTextureBuffers() {
    ForEachEnabledBit(channel_state->enabled_compute_texture_buffers, [&](u32 index) {
@@ -1841,6 +1932,11 @@ void BufferCache<P>::DeleteBuffer(BufferId buffer_id, bool do_not_mark) {
    const auto replace = [scalar_replace](std::span<Binding> bindings) {
        std::ranges::for_each(bindings, scalar_replace);
    };
+    const auto storage_replace = [scalar_replace](std::span<StorageBufferBindingInfo> bindings) {
+        for (StorageBufferBindingInfo& binding : bindings) {
+            std::ranges::for_each(binding.segments, scalar_replace);
+        }
+    };

    if (channel_state->index_buffer.buffer_id == buffer_id) {
        channel_state->index_buffer.buffer_id = BufferId{};
@@ -1856,10 +1952,10 @@ void BufferCache<P>::DeleteBuffer(BufferId buffer_id, bool do_not_mark) {
        }
    }
    std::ranges::for_each(channel_state->uniform_buffers, replace);
-    std::ranges::for_each(channel_state->storage_buffers, replace);
+    std::ranges::for_each(channel_state->storage_buffers, storage_replace);
    replace(channel_state->transform_feedback_buffers);
    replace(channel_state->compute_uniform_buffers);
-    replace(channel_state->compute_storage_buffers);
+    storage_replace(channel_state->compute_storage_buffers);

    // Mark the whole buffer as CPU written to stop tracking CPU writes
    if (!do_not_mark) {
@@ -1896,12 +1992,14 @@ void BufferCache<P>::DeleteBuffer(BufferId buffer_id, bool do_not_mark) {
 }

 template <class P>
-Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
-                                             bool is_written) const {
+StorageBufferBindingInfo BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
+                                                              bool is_written, u32 descriptor_count) const {
+    // time to get rid of these null bindings
+    ASSERT(descriptor_count > 0); // shant happen
    const GPUVAddr gpu_addr = gpu_memory->Read<u64>(ssbo_addr);

    if (gpu_addr == 0) {
-        return NULL_BINDING;
+        return {.descriptor_count = descriptor_count};
    }

    const auto size = [&]() {
@@ -1923,21 +2021,17 @@ Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
    const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment);
    const u32 aligned_size = static_cast<u32>(gpu_addr - aligned_gpu_addr) + size;

-    const std::optional<DAddr> aligned_device_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr);
-    if (!aligned_device_addr || size == 0) {
+    if (!gpu_memory->GpuToCpuAddress(aligned_gpu_addr) || size == 0) {
        LOG_DEBUG(HW_GPU, "Failed to find storage buffer for cbuf index {}", cbuf_index);
-        return NULL_BINDING;
+        return {.descriptor_count = descriptor_count};
    }
-    const std::optional<DAddr> device_addr = gpu_memory->GpuToCpuAddress(gpu_addr);
-    ASSERT_MSG(device_addr, "Unaligned storage buffer address not found for cbuf index {}",
-               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);
+    const GPUVAddr gpu_end = Common::AlignUp(gpu_addr + size, Core::DEVICE_PAGESIZE);

-    const Binding binding{
-        .device_addr = *aligned_device_addr,
-        .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *aligned_device_addr),
-        .buffer_id = BufferId{},
+    const StorageBufferBindingInfo binding{
+        .gpu_addr = aligned_gpu_addr,
+        .size = is_written ? aligned_size : static_cast<u32>(gpu_end - aligned_gpu_addr),
+        .descriptor_count = descriptor_count,
    };
    return binding;
 }
@@ -89,6 +89,15 @@ struct TextureBufferBinding : Binding {
    PixelFormat format;
 };

+struct StorageBufferBindingInfo {
+    // another good one: guest SSBO is a virtual interval and may span discontiguous device-memory ranges.
+    // exact case of missing character frames (high sample lane)
+    GPUVAddr gpu_addr{};
+    u32 size{};
+    u32 descriptor_count{1};
+    boost::container::small_vector<Binding, 1> segments;
+};
+
 static constexpr Binding NULL_BINDING{
    .device_addr = 0,
    .size = 0,
@@ -115,14 +124,15 @@ public:
    Binding index_buffer;
    std::array<Binding, NUM_VERTEX_BUFFERS> vertex_buffers;
    std::array<std::array<Binding, NUM_GRAPHICS_UNIFORM_BUFFERS>, NUM_STAGES> uniform_buffers;
-    std::array<std::array<Binding, NUM_STORAGE_BUFFERS>, NUM_STAGES> storage_buffers;
+    std::array<std::array<StorageBufferBindingInfo, NUM_STORAGE_BUFFERS>, NUM_STAGES>
+        storage_buffers;
    std::array<std::array<TextureBufferBinding, NUM_TEXTURE_BUFFERS>, NUM_STAGES> texture_buffers;
    std::array<Binding, NUM_TRANSFORM_FEEDBACK_BUFFERS> transform_feedback_buffers;
    Binding count_buffer_binding;
    Binding indirect_buffer_binding;

    std::array<Binding, NUM_COMPUTE_UNIFORM_BUFFERS> compute_uniform_buffers;
-    std::array<Binding, NUM_STORAGE_BUFFERS> compute_storage_buffers;
+    std::array<StorageBufferBindingInfo, NUM_STORAGE_BUFFERS> compute_storage_buffers;
    std::array<TextureBufferBinding, NUM_TEXTURE_BUFFERS> compute_texture_buffers;

    std::array<u32, NUM_STAGES> enabled_uniform_buffer_masks{};
@@ -249,7 +259,7 @@ public:
    void UnbindGraphicsStorageBuffers(size_t stage);

    bool BindGraphicsStorageBuffer(size_t stage, size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset,
-                                   bool is_written);
+                                   bool is_written, u32 descriptor_count = 1);

    void UnbindGraphicsTextureBuffers(size_t stage);

@@ -259,7 +269,7 @@ public:
    void UnbindComputeStorageBuffers();

    void BindComputeStorageBuffer(size_t ssbo_index, u32 cbuf_index, u32 cbuf_offset,
-                                  bool is_written);
+                                  bool is_written, u32 descriptor_count = 1);

    void UnbindComputeTextureBuffers();

@@ -400,6 +410,8 @@ private:

    void UpdateStorageBuffers(size_t stage);

+    void UpdateStorageBuffer(StorageBufferBindingInfo& binding);
+
    void UpdateTextureBuffers(size_t stage);

    void UpdateTransformFeedbackBuffers();
@@ -449,8 +461,9 @@ private:

    void DeleteBuffer(BufferId buffer_id, bool do_not_mark = false);

-    [[nodiscard]] Binding StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
-                                               bool is_written) const;
+    [[nodiscard]] StorageBufferBindingInfo StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
+                                                                bool is_written,
+                                                                u32 descriptor_count) const;

    [[nodiscard]] TextureBufferBinding GetTextureBufferBinding(GPUVAddr gpu_addr, u32 size,
                                                               PixelFormat format);
@@ -6,6 +6,7 @@

 #pragma once

+#include <array>
 #include <cstddef>
 #include <optional>

@@ -136,6 +137,7 @@ inline void WriteDescriptorBuffer(const Device& device, const DescriptorBufferLa

 [[nodiscard]] inline u32 NumDescriptorEntries(const Shader::Info& info) {
    return Shader::NumDescriptors(info.constant_buffer_descriptors) +
+           static_cast<u32>(Shader::UsesStorageBufferMappings(info)) +
           Shader::NumDescriptors(info.storage_buffers_descriptors) +
           Shader::NumDescriptors(info.texture_buffer_descriptors) +
           Shader::NumDescriptors(info.image_buffer_descriptors) +
@@ -268,6 +270,12 @@ public:
        is_compute |= (stage & VK_SHADER_STAGE_COMPUTE_BIT) != 0;

        Add(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, stage, info.constant_buffer_descriptors);
+        // for extra implicit storage-buffer binding required by mapped-storage-buffer support
+        if (Shader::UsesStorageBufferMappings(info)) {
+            struct Descriptor { u32 count; };
+            const std::array descriptors{Descriptor{1}};
+            Add(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, stage, descriptors);
+        }
        Add(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, stage, info.storage_buffers_descriptors);
        Add(VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, stage, info.texture_buffer_descriptors);
        Add(VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, stage, info.image_buffer_descriptors);
@@ -695,7 +695,7 @@ vk::Buffer BufferCacheRuntime::CreateNullBuffer() {
        .flags = 0,
        .size = 4,
        .usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT |
-                 VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT,
+                 VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
        .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
        .queueFamilyIndexCount = 0,
        .pQueueFamilyIndices = nullptr,
@@ -155,6 +155,13 @@ public:
        return ref.mapped_span;
    }

+    // compute/graphics new binding
+    std::span<u8> BindMappedStorageBuffer(u32 size) {
+        const StagingBufferRef ref = staging_pool.Request(size, MemoryUsage::Upload);
+        guest_descriptor_queue.AddBuffer(ref.buffer, ref.device_address, static_cast<u32>(ref.offset), size);
+        return ref.mapped_span;
+    }
+
    void BindUniformBuffer(const Buffer& buffer, u32 offset, u32 size) {
        BindBuffer(buffer, offset, size);
    }
@@ -157,9 +157,7 @@ bool ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute,
    buffer_cache.UnbindComputeStorageBuffers();
    size_t ssbo_index{};
    for (const auto& desc : info.storage_buffers_descriptors) {
-        ASSERT(desc.count == 1);
-        buffer_cache.BindComputeStorageBuffer(ssbo_index, desc.cbuf_index, desc.cbuf_offset,
-                                              desc.is_written);
+        buffer_cache.BindComputeStorageBuffer(ssbo_index, desc.cbuf_index, desc.cbuf_offset, desc.is_written, desc.count);
        ++ssbo_index;
    }

@@ -47,7 +47,7 @@ static DescriptorBankInfo MakeBankInfo(std::span<const Shader::Info> infos) {
    DescriptorBankInfo bank;
    for (const Shader::Info& info : infos) {
        bank.uniform_buffers += Accumulate(info.constant_buffer_descriptors);
-        bank.storage_buffers += Accumulate(info.storage_buffers_descriptors);
+        bank.storage_buffers += Accumulate(info.storage_buffers_descriptors) + static_cast<u32>(Shader::UsesStorageBufferMappings(info));
        bank.texture_buffers += Accumulate(info.texture_buffer_descriptors);
        bank.image_buffers += Accumulate(info.image_buffer_descriptors);
        bank.textures += Accumulate(info.texture_descriptors);
@@ -367,9 +367,8 @@ bool GraphicsPipeline::ConfigureImpl(bool is_indexed) {
        if constexpr (Spec::has_storage_buffers) {
            size_t ssbo_index{};
            for (const auto& desc : info.storage_buffers_descriptors) {
-                ASSERT(desc.count == 1);
                buffer_cache.BindGraphicsStorageBuffer(stage, ssbo_index, desc.cbuf_index,
-                                                       desc.cbuf_offset, desc.is_written);
+                                                       desc.cbuf_offset, desc.is_written, desc.count);
                ++ssbo_index;
            }
        }
@@ -62,7 +62,12 @@ using VideoCommon::FileEnvironment;
 using VideoCommon::GenericEnvironment;
 using VideoCommon::GraphicsEnvironment;

-constexpr u32 CACHE_VERSION = 18;
+// SPIR-V descriptor arrays require a fixed pipeline-layout count.
+// Exploration ceiling; buffer-cache telemetry records the actual physical-range demand.
+// Keep this modest because every mapped SSBO binds the full fixed array on each update.
+constexpr u32 MAX_MAPPED_STORAGE_BUFFER_DESCRIPTORS = 32;
+
+constexpr u32 CACHE_VERSION = 19;
 constexpr size_t VULKAN_CACHE_FLUSH_PIPELINES = 128;
 constexpr size_t VULKAN_CACHE_FLUSH_MIN_SECONDS = 30;
 constexpr std::array<char, 8> VULKAN_CACHE_MAGIC_NUMBER{'y', 'u', 'z', 'u', 'v', 'k', 'c', 'h'};
@@ -432,6 +437,8 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
            device.IsUniformTexelBufferArrayNonUniformIndexingSupported(),
        .support_storage_texel_buffer_array_nonuniform_indexing =
            device.IsStorageTexelBufferArrayNonUniformIndexingSupported(),
+        .support_storage_buffer_array_nonuniform_indexing =
+            device.IsStorageBufferArrayNonUniformIndexingSupported(),

        .warp_size_potentially_larger_than_guest = device.IsWarpSizePotentiallyBiggerThanGuest(),

@@ -460,6 +467,7 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
    host_info = Shader::HostTranslateInfo{
        .min_ssbo_alignment = device.GetStorageBufferAlignment(),
        .max_per_stage_descriptor_sampled_images = device.GetMaxPerStageDescriptorSampledImages(),
+        .max_per_stage_descriptor_storage_buffers = device.GetMaxPerStageDescriptorStorageBuffers(),
        .max_per_stage_resources = device.GetMaxPerStageResources(),
        .max_descriptor_set_samplers = device.GetMaxDescriptorSetSamplers(),
        .max_descriptor_set_uniform_buffers = device.GetMaxDescriptorSetUniformBuffers(),
@@ -479,6 +487,20 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
        .support_viewport_index_layer = device.IsExtShaderViewportIndexLayerSupported(),
        .support_geometry_shader_passthrough = device.IsNvGeometryShaderPassthroughSupported(),
        .support_conditional_barrier = device.SupportsConditionalBarriers(),
+        .storage_buffer_segment_count = [&] {
+            if (!device.IsStorageBufferArrayNonUniformIndexingSupported()) {
+                return 1U;
+            }
+            constexpr u32 MaxGraphicsStages = static_cast<u32>(Maxwell::MaxShaderStage);
+            const auto reserve = [](u32 limit, u32 count) {
+                return limit > count ? limit - count : 0U;
+            };
+            const u32 per_stage = reserve(device.GetMaxPerStageDescriptorStorageBuffers(), 1) / static_cast<u32>(Shader::Info::MAX_SSBOS);
+            const u32 per_set = reserve(device.GetMaxDescriptorSetStorageBuffers(), MaxGraphicsStages) / (static_cast<u32>(Shader::Info::MAX_SSBOS) * MaxGraphicsStages);
+            const u32 resources = reserve(device.GetMaxPerStageResources(), 1) / (static_cast<u32>(Shader::Info::MAX_SSBOS) * 2);
+            // ensure at least one storage buffer segment is available per stage. max is still arbitrary
+            return (std::max)(1U, (std::min)({MAX_MAPPED_STORAGE_BUFFER_DESCRIPTORS, per_stage, per_set, resources}));
+        }(),
    };
    host_info.ApplyDescriptorLimitPolicy();

@@ -708,7 +708,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
        descriptor_indexing.shaderUniformTexelBufferArrayDynamicIndexing = false;
        descriptor_indexing.shaderStorageTexelBufferArrayDynamicIndexing = false;
        descriptor_indexing.shaderUniformBufferArrayNonUniformIndexing = false;
-        descriptor_indexing.shaderStorageBufferArrayNonUniformIndexing = false;
        descriptor_indexing.shaderInputAttachmentArrayNonUniformIndexing = false;
        descriptor_indexing.descriptorBindingUniformBufferUpdateAfterBind = false;
        descriptor_indexing.descriptorBindingSampledImageUpdateAfterBind = false;
@@ -360,6 +360,7 @@ public:
 #define FN_MAX_LIMIT_LIST \
    FN_MAX_LIMIT_ELEM(ComputeSharedMemorySize) \
    FN_MAX_LIMIT_ELEM(PerStageDescriptorSampledImages) \
+    FN_MAX_LIMIT_ELEM(PerStageDescriptorStorageBuffers) \
    FN_MAX_LIMIT_ELEM(PerStageResources) \
    FN_MAX_LIMIT_ELEM(DescriptorSetSamplers) \
    FN_MAX_LIMIT_ELEM(DescriptorSetUniformBuffers) \
@@ -415,6 +416,10 @@ FN_MAX_LIMIT_LIST
        return features.descriptor_indexing.shaderStorageTexelBufferArrayNonUniformIndexing;
    }

+    bool IsStorageBufferArrayNonUniformIndexingSupported() const {
+        return features.descriptor_indexing.shaderStorageBufferArrayNonUniformIndexing;
+    }
+
    /// Returns true if the device supports float64 natively.
    bool IsFloat64Supported() const {
        return features.features.shaderFloat64;
Author	SHA1	Message	Date
xbzk	9a99044df8	Update src/shader_recompiler/backend/glsl/emit_glsl.cpp	2026-09-05 05:47:48 +02:00
xbzk	79c4142760	Update src/shader_recompiler/backend/glsl/emit_glsl.cpp unrelated. merely to avoid build error.	2026-09-05 05:43:32 +02:00
xbzk	11d65f2ab7	[vk] map fragmented storage buffers with descriptor arrays (mhr fix)	2026-09-04 20:44:46 -03:00
lizzie	f6e7686038	[ci] Fix macOS "no type named 'free' in namespace 'std' (#4347 ) Signed-off-by: lizzie <lizzie@eden-emu.dev> - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4347 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-09-04 13:32:36 +02:00
xbzk	1dcc574591	[gdb] fix conn state to use same pipe (instead of a copy) (#4339 ) - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- I was trying to use GDB stub to investigate MHR and it was not connecting. Error was suggesting it was not available for connection although i saw it booting on logs. Debugged and noticed signal_pipe_ was not the correct one, and followed the example of client_socket_. GDB stub is now working, on windows, at least. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4339 Reviewed-by: Lizzie and Samuel <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-09-02 14:04:35 +02:00
lizzie	5c20f244c9	[cmake] stop building OpenGL on Android (#4342 ) Signed-off-by: lizzie <lizzie@eden-emu.dev> - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- we don't even support OpenGL on android Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4342 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-09-02 04:07:24 +02:00
crueter	aa4e494c08	[android] Replace Oboe audio with SDL3 audio (#4338 ) Supersedes #4335. Replaces the Oboe audio backend with SDL3, since we already support it. A few caveats: - SDL defines a JVM OnLoad method already, so we have to instead hijack NativeLibrary for id_cache initialization - This also means some internal fields in Double/Integer/Boolean (namely `value`) can't be accessed, so I switched those to methods for now. - SDL Java sources are pulled in from the CI package. - Since we can't use SDLActivity, `SDL.setupJNI()` handles everything Signed-off-by: crueter <crueter@eden-emu.dev> - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4338 Reviewed-by: Lizzie and Samuel <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-09-02 00:29:58 +02:00