Fix license headers

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

.gitignore

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

CMakeLists.txt

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

cpmfile.json

@@ -186,6 +186,12 @@
         "repo": "eden-emulator/oaknut",
         "version": "v2.0.3"
     },
+    "oboe": {
+        "bundled": true,
+        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
+        "repo": "google/oboe",
+        "version": "1.10.0"
+    },
     "openssl": {
         "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
         "min_version": "3.0.0",

docs/Options.md

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

externals/CMakeLists.txt

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

src/android/app/build.gradle.kts

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

src/android/app/proguard-rules.pro

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

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

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

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

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

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

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

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

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

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

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

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

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

src/audio_core/CMakeLists.txt

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

src/audio_core/sink/oboe_sink.cpp

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

src/audio_core/sink/oboe_sink.h

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

src/audio_core/sink/sink_details.cpp

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

src/common/CMakeLists.txt

@@ -89,7 +89,6 @@ add_library(
     param_package.h
     parent_of_member.h
     point.h
-    quaternion.h
     range_map.h
     range_mutex.h
     range_sets.h

src/common/android/android_common.cpp

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

src/common/android/id_cache.cpp

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

src/common/android/id_cache.h

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

src/common/quaternion.h

@@ -1,79 +0,0 @@
-// SPDX-FileCopyrightText: 2016 Citra Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/vector_math.h"
-
-namespace Common {
-
-template <typename T>
-class Quaternion {
-public:
-    Vec3<T> xyz;
-    T w{};
-
-    [[nodiscard]] Quaternion<decltype(-T{})> Inverse() const {
-        return {-xyz, w};
-    }
-
-    [[nodiscard]] Quaternion<decltype(T{} + T{})> operator+(const Quaternion& other) const {
-        return {xyz + other.xyz, w + other.w};
-    }
-
-    [[nodiscard]] Quaternion<decltype(T{} - T{})> operator-(const Quaternion& other) const {
-        return {xyz - other.xyz, w - other.w};
-    }
-
-    [[nodiscard]] Quaternion<decltype(T{} * T{} - T{} * T{})> operator*(
-        const Quaternion& other) const {
-        return {xyz * other.w + other.xyz * w + Cross(xyz, other.xyz),
-                w * other.w - Dot(xyz, other.xyz)};
-    }
-
-    [[nodiscard]] Quaternion<T> Normalized() const {
-        T length = std::sqrt(xyz.Length2() + w * w);
-        return {xyz / length, w / length};
-    }
-
-    [[nodiscard]] std::array<decltype(-T{}), 16> ToMatrix() const {
-        const T x2 = xyz[0] * xyz[0];
-        const T y2 = xyz[1] * xyz[1];
-        const T z2 = xyz[2] * xyz[2];
-
-        const T xy = xyz[0] * xyz[1];
-        const T wz = w * xyz[2];
-        const T xz = xyz[0] * xyz[2];
-        const T wy = w * xyz[1];
-        const T yz = xyz[1] * xyz[2];
-        const T wx = w * xyz[0];
-
-        return {1.0f - 2.0f * (y2 + z2),
-                2.0f * (xy + wz),
-                2.0f * (xz - wy),
-                0.0f,
-                2.0f * (xy - wz),
-                1.0f - 2.0f * (x2 + z2),
-                2.0f * (yz + wx),
-                0.0f,
-                2.0f * (xz + wy),
-                2.0f * (yz - wx),
-                1.0f - 2.0f * (x2 + y2),
-                0.0f,
-                0.0f,
-                0.0f,
-                0.0f,
-                1.0f};
-    }
-};
-
-template <typename T>
-[[nodiscard]] auto QuaternionRotate(const Quaternion<T>& q, const Vec3<T>& v) {
-    return v + 2 * Cross(q.xyz, Cross(q.xyz, v) + v * q.w);
-}
-
-[[nodiscard]] inline Quaternion<float> MakeQuaternion(const Vec3<float>& axis, float angle) {
-    return {axis * std::sin(angle / 2), std::cos(angle / 2)};
-}
-
-} // namespace Common

src/common/settings_enums.h

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

src/common/vector_math.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2014 Tony Wasserka
@@ -7,752 +7,128 @@
 
 #pragma once
 
-#ifdef __ARM_NEON
-#include <arm_neon.h>
-#endif
-
 #include <cmath>
 #include <type_traits>
 
 namespace Common {
 
-template <typename T>
+template <typename T, size_t N>
-class Vec2;
+class Vec {
-template <typename T>
-class Vec3;
-template <typename T>
-class Vec4;
-
-template <typename T>
-class Vec2 {
 public:
-    T x{};
+    std::array<T, N> elems{};
-    T y{};
 
-    constexpr Vec2() = default;
+    constexpr Vec() = default;
-    constexpr Vec2(const T& x_, const T& y_) : x(x_), y(y_) {}
+    constexpr Vec(T e0) noexcept : elems{e0} {}
+    constexpr Vec(T e0, T e1) noexcept : elems{e0, e1} {}
+    constexpr Vec(T e0, T e1, T e2) noexcept : elems{e0, e1, e2} {}
+    constexpr Vec(T e0, T e1, T e2, T e4) noexcept : elems{e0, e1, e2, e4} {}
+    //explicit constexpr Vec(const std::initializer_list<T> elems_) noexcept : elems{elems_} {}
 
-    template <typename T2>
+    [[nodiscard]] constexpr Vec<decltype(T{} + T{}), N> operator+(const Vec o) const noexcept {
-    [[nodiscard]] constexpr Vec2<T2> Cast() const {
+        Vec<decltype(T{} + T{}), N> r{};
-        return Vec2<T2>(static_cast<T2>(x), static_cast<T2>(y));
+        for (size_t i = 0; i < N; ++i)
+            r.elems[i] = elems[i] + o.elems[i];
+        return r;
     }
+    constexpr Vec<T, N> operator+=(const Vec<T, N> o) noexcept { return *this = *this + o; }
 
-    [[nodiscard]] static constexpr Vec2 AssignToAll(const T& f) {
+    [[nodiscard]] constexpr Vec<decltype(T{} - T{}), N> operator-(const Vec o) const noexcept {
-        return Vec2{f, f};
+        Vec<decltype(T{} - T{}), N> r{};
-    }
+        for (size_t i = 0; i < N; ++i)
-
+            r.elems[i] = elems[i] - o.elems[i];
-    [[nodiscard]] constexpr Vec2<decltype(T{} + T{})> operator+(const Vec2& other) const {
+        return r;
-        return {x + other.x, y + other.y};
-    }
-    constexpr Vec2& operator+=(const Vec2& other) {
-        x += other.x;
-        y += other.y;
-        return *this;
-    }
-    [[nodiscard]] constexpr Vec2<decltype(T{} - T{})> operator-(const Vec2& other) const {
-        return {x - other.x, y - other.y};
-    }
-    constexpr Vec2& operator-=(const Vec2& other) {
-        x -= other.x;
-        y -= other.y;
-        return *this;
     }
+    constexpr Vec<T, N> operator-=(const Vec<T, N> o) noexcept { return *this = *this - o; }
 
     template <typename U = T>
-    [[nodiscard]] constexpr Vec2<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const {
+    [[nodiscard]] constexpr Vec<std::enable_if_t<std::is_signed_v<U>, U>, N> operator-() const noexcept {
-        return {-x, -y};
+        Vec<U, N> r{};
-    }
+        for (size_t i = 0; i < N; ++i)
-    [[nodiscard]] constexpr Vec2<decltype(T{} * T{})> operator*(const Vec2& other) const {
+            r.elems[i] = -elems[i];
-        return {x * other.x, y * other.y};
+        return r;
     }
 
+    [[nodiscard]] constexpr Vec<decltype(T{} * T{}), N> operator*(const Vec o) const noexcept {
+        Vec<decltype(T{} * T{}), N> r{};
+        for (size_t i = 0; i < N; ++i)
+            r.elems[i] = elems[i] * o.elems[i];
+        return r;
+    }
     template <typename V>
-    [[nodiscard]] constexpr Vec2<decltype(T{} * V{})> operator*(const V& f) const {
+    [[nodiscard]] constexpr Vec<decltype(T{} * V{}), N> operator*(const V f) const noexcept {
         using TV = decltype(T{} * V{});
         using C = std::common_type_t<T, V>;
-
+        Vec<TV, N> r{};
-        return {
+        for (size_t i = 0; i < N; ++i)
-            static_cast<TV>(static_cast<C>(x) * static_cast<C>(f)),
+            r.elems[i] = TV(C(elems[i]) * C(f));
-            static_cast<TV>(static_cast<C>(y) * static_cast<C>(f)),
+        return r;
-        };
     }
+    template <typename V>
+    constexpr Vec<T, N> operator*=(const V f) noexcept { return *this = *this * f; }
 
     template <typename V>
-    constexpr Vec2& operator*=(const V& f) {
+    [[nodiscard]] constexpr Vec<decltype(T{} / V{}), N> operator/(const V f) const noexcept {
-        *this = *this * f;
-        return *this;
-    }
-
-    template <typename V>
-    [[nodiscard]] constexpr Vec2<decltype(T{} / V{})> operator/(const V& f) const {
         using TV = decltype(T{} / V{});
         using C = std::common_type_t<T, V>;
-
+        Vec<TV, N> r{};
-        return {
+        for (size_t i = 0; i < N; ++i)
-            static_cast<TV>(static_cast<C>(x) / static_cast<C>(f)),
+            r.elems[i] = TV(C(elems[i]) / C(f));
-            static_cast<TV>(static_cast<C>(y) / static_cast<C>(f)),
+        return r;
-        };
     }
-
     template <typename V>
-    constexpr Vec2& operator/=(const V& f) {
+    constexpr Vec<T, N> operator/=(const V f) noexcept { return *this = *this / f; }
-        *this = *this / f;
-        return *this;
-    }
 
-    [[nodiscard]] constexpr T Length2() const {
+    [[nodiscard]] constexpr T Length2() const noexcept {
-        return x * x + y * y;
+        T r{};
+        for (size_t i = 0; i < N; ++i)
+            r += elems[i] * elems[i];
+        return r;
     }
-
     // Only implemented for T=float
-    [[nodiscard]] float Length() const;
+    [[nodiscard]] T Length() const { return T(std::sqrt(float(Length2()))); }
-    [[nodiscard]] float Normalize(); // returns the previous length, which is often useful
+    [[nodiscard]] Vec<T, N> Normalized() const { return *this / Length(); }
+    [[nodiscard]] constexpr T& operator[](std::size_t i) noexcept { return elems[i]; }
+    [[nodiscard]] constexpr const T& operator[](std::size_t i) const noexcept { return elems[i]; }
 
-    [[nodiscard]] constexpr T& operator[](std::size_t i) {
+    [[nodiscard]] std::array<decltype(-T{}), 16> ToMatrix() const {
-        return *((&x) + i);
+        const T x2 = elems[0] * elems[0];
-    }
+        const T y2 = elems[1] * elems[1];
-    [[nodiscard]] constexpr const T& operator[](std::size_t i) const {
+        const T z2 = elems[2] * elems[2];
-        return *((&x) + i);
-    }
 
-    constexpr void SetZero() {
+        const T xy = elems[0] * elems[1];
-        x = 0;
+        const T wz = elems[3] * elems[2];
-        y = 0;
+        const T xz = elems[0] * elems[2];
-    }
+        const T wy = elems[3] * elems[1];
-
+        const T yz = elems[1] * elems[2];
-    // Common aliases: UV (texel coordinates), ST (texture coordinates)
+        const T wx = elems[3] * elems[0];
-    [[nodiscard]] constexpr T& u() {
+        return {
-        return x;
+            1.0f - 2.0f * (y2 + z2),
-    }
+            2.0f * (xy + wz),
-    [[nodiscard]] constexpr T& v() {
+            2.0f * (xz - wy),
-        return y;
+            0.0f,
-    }
+            2.0f * (xy - wz),
-    [[nodiscard]] constexpr T& s() {
+            1.0f - 2.0f * (x2 + z2),
-        return x;
+            2.0f * (yz + wx),
-    }
+            0.0f,
-    [[nodiscard]] constexpr T& t() {
+            2.0f * (xz + wy),
-        return y;
+            2.0f * (yz - wx),
-    }
+            1.0f - 2.0f * (x2 + y2),
-
+            0.0f,
-    [[nodiscard]] constexpr const T& u() const {
+            0.0f,
-        return x;
+            0.0f,
-    }
+            0.0f,
-    [[nodiscard]] constexpr const T& v() const {
+            1.0f
-        return y;
+        };
-    }
-    [[nodiscard]] constexpr const T& s() const {
-        return x;
-    }
-    [[nodiscard]] constexpr const T& t() const {
-        return y;
-    }
-
-    // swizzlers - create a subvector of specific components
-    [[nodiscard]] constexpr Vec2 yx() const {
-        return Vec2(y, x);
-    }
-    [[nodiscard]] constexpr Vec2 vu() const {
-        return Vec2(y, x);
-    }
-    [[nodiscard]] constexpr Vec2 ts() const {
-        return Vec2(y, x);
     }
 };
 
-template <typename T, typename V>
+template <typename T, size_t N, typename V>
-[[nodiscard]] constexpr Vec2<T> operator*(const V& f, const Vec2<T>& vec) {
+[[nodiscard]] constexpr Vec<T, N> operator*(const V f, const Vec<T, N> v) noexcept {
     using C = std::common_type_t<T, V>;
-
+    Vec<T, N> r{};
-    return Vec2<T>(static_cast<T>(static_cast<C>(f) * static_cast<C>(vec.x)),
+    for (size_t i = 0; i < N; ++i)
-                   static_cast<T>(static_cast<C>(f) * static_cast<C>(vec.y)));
+        r.elems[i] = T(C(f) * C(v.elems[i]));
-}
+    return r;
-
-using Vec2f = Vec2<float>;
-
-template <>
-inline float Vec2<float>::Length() const {
-    return std::sqrt(x * x + y * y);
-}
-
-template <>
-inline float Vec2<float>::Normalize() {
-    float length = Length();
-    *this /= length;
-    return length;
-}
-
-template <typename T>
-class Vec3 {
-public:
-    T x{};
-    T y{};
-    T z{};
-
-    constexpr Vec3() = default;
-    constexpr Vec3(const T& x_, const T& y_, const T& z_) : x(x_), y(y_), z(z_) {}
-
-    template <typename T2>
-    [[nodiscard]] constexpr Vec3<T2> Cast() const {
-        return Vec3<T2>(static_cast<T2>(x), static_cast<T2>(y), static_cast<T2>(z));
-    }
-
-    [[nodiscard]] static constexpr Vec3 AssignToAll(const T& f) {
-        return Vec3(f, f, f);
-    }
-
-    [[nodiscard]] constexpr Vec3<decltype(T{} + T{})> operator+(const Vec3& other) const {
-        return {x + other.x, y + other.y, z + other.z};
-    }
-
-    constexpr Vec3& operator+=(const Vec3& other) {
-        x += other.x;
-        y += other.y;
-        z += other.z;
-        return *this;
-    }
-
-    [[nodiscard]] constexpr Vec3<decltype(T{} - T{})> operator-(const Vec3& other) const {
-        return {x - other.x, y - other.y, z - other.z};
-    }
-
-    constexpr Vec3& operator-=(const Vec3& other) {
-        x -= other.x;
-        y -= other.y;
-        z -= other.z;
-        return *this;
-    }
-
-    template <typename U = T>
-    [[nodiscard]] constexpr Vec3<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const {
-        return {-x, -y, -z};
-    }
-
-    [[nodiscard]] constexpr Vec3<decltype(T{} * T{})> operator*(const Vec3& other) const {
-        return {x * other.x, y * other.y, z * other.z};
-    }
-
-    template <typename V>
-    [[nodiscard]] constexpr Vec3<decltype(T{} * V{})> operator*(const V& f) const {
-        using TV = decltype(T{} * V{});
-        using C = std::common_type_t<T, V>;
-
-        return {
-            static_cast<TV>(static_cast<C>(x) * static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(y) * static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(z) * static_cast<C>(f)),
-        };
-    }
-
-    template <typename V>
-    constexpr Vec3& operator*=(const V& f) {
-        *this = *this * f;
-        return *this;
-    }
-    template <typename V>
-    [[nodiscard]] constexpr Vec3<decltype(T{} / V{})> operator/(const V& f) const {
-        using TV = decltype(T{} / V{});
-        using C = std::common_type_t<T, V>;
-
-        return {
-            static_cast<TV>(static_cast<C>(x) / static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(y) / static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(z) / static_cast<C>(f)),
-        };
-    }
-
-    template <typename V>
-    constexpr Vec3& operator/=(const V& f) {
-        *this = *this / f;
-        return *this;
-    }
-
-    void RotateFromOrigin(float roll, float pitch, float yaw) {
-        float temp = y;
-        y = std::cos(roll) * y - std::sin(roll) * z;
-        z = std::sin(roll) * temp + std::cos(roll) * z;
-
-        temp = x;
-        x = std::cos(pitch) * x + std::sin(pitch) * z;
-        z = -std::sin(pitch) * temp + std::cos(pitch) * z;
-
-        temp = x;
-        x = std::cos(yaw) * x - std::sin(yaw) * y;
-        y = std::sin(yaw) * temp + std::cos(yaw) * y;
-    }
-
-    [[nodiscard]] constexpr T Length2() const {
-        return x * x + y * y + z * z;
-    }
-
-    // Only implemented for T=float
-    [[nodiscard]] float Length() const;
-    [[nodiscard]] Vec3 Normalized() const;
-    [[nodiscard]] float Normalize(); // returns the previous length, which is often useful
-
-    [[nodiscard]] constexpr T& operator[](std::size_t i) {
-        return *((&x) + i);
-    }
-
-    [[nodiscard]] constexpr const T& operator[](std::size_t i) const {
-        return *((&x) + i);
-    }
-
-    constexpr void SetZero() {
-        x = 0;
-        y = 0;
-        z = 0;
-    }
-
-    // Common aliases: UVW (texel coordinates), RGB (colors), STQ (texture coordinates)
-    [[nodiscard]] constexpr T& u() {
-        return x;
-    }
-    [[nodiscard]] constexpr T& v() {
-        return y;
-    }
-    [[nodiscard]] constexpr T& w() {
-        return z;
-    }
-
-    [[nodiscard]] constexpr T& r() {
-        return x;
-    }
-    [[nodiscard]] constexpr T& g() {
-        return y;
-    }
-    [[nodiscard]] constexpr T& b() {
-        return z;
-    }
-
-    [[nodiscard]] constexpr T& s() {
-        return x;
-    }
-    [[nodiscard]] constexpr T& t() {
-        return y;
-    }
-    [[nodiscard]] constexpr T& q() {
-        return z;
-    }
-
-    [[nodiscard]] constexpr const T& u() const {
-        return x;
-    }
-    [[nodiscard]] constexpr const T& v() const {
-        return y;
-    }
-    [[nodiscard]] constexpr const T& w() const {
-        return z;
-    }
-
-    [[nodiscard]] constexpr const T& r() const {
-        return x;
-    }
-    [[nodiscard]] constexpr const T& g() const {
-        return y;
-    }
-    [[nodiscard]] constexpr const T& b() const {
-        return z;
-    }
-
-    [[nodiscard]] constexpr const T& s() const {
-        return x;
-    }
-    [[nodiscard]] constexpr const T& t() const {
-        return y;
-    }
-    [[nodiscard]] constexpr const T& q() const {
-        return z;
-    }
-
-// swizzlers - create a subvector of specific components
-// e.g. Vec2 uv() { return Vec2(x,y); }
-// _DEFINE_SWIZZLER2 defines a single such function, DEFINE_SWIZZLER2 defines all of them for all
-// component names (x<->r) and permutations (xy<->yx)
-#define _DEFINE_SWIZZLER2(a, b, name)                                                              \
-    [[nodiscard]] constexpr Vec2<T> name() const { return Vec2<T>(a, b); }
-#define DEFINE_SWIZZLER2(a, b, a2, b2, a3, b3, a4, b4)                                             \
-    _DEFINE_SWIZZLER2(a, b, a##b);                                                                 \
-    _DEFINE_SWIZZLER2(a, b, a2##b2);                                                               \
-    _DEFINE_SWIZZLER2(a, b, a3##b3);                                                               \
-    _DEFINE_SWIZZLER2(a, b, a4##b4);                                                               \
-    _DEFINE_SWIZZLER2(b, a, b##a);                                                                 \
-    _DEFINE_SWIZZLER2(b, a, b2##a2);                                                               \
-    _DEFINE_SWIZZLER2(b, a, b3##a3);                                                               \
-    _DEFINE_SWIZZLER2(b, a, b4##a4)
-
-    DEFINE_SWIZZLER2(x, y, r, g, u, v, s, t);
-    DEFINE_SWIZZLER2(x, z, r, b, u, w, s, q);
-    DEFINE_SWIZZLER2(y, z, g, b, v, w, t, q);
-#undef DEFINE_SWIZZLER2
-#undef _DEFINE_SWIZZLER2
-};
-
-template <typename T, typename V>
-[[nodiscard]] constexpr Vec3<T> operator*(const V& f, const Vec3<T>& vec) {
-    using C = std::common_type_t<T, V>;
-
-    return Vec3<T>(static_cast<T>(static_cast<C>(f) * static_cast<C>(vec.x)),
-                   static_cast<T>(static_cast<C>(f) * static_cast<C>(vec.y)),
-                   static_cast<T>(static_cast<C>(f) * static_cast<C>(vec.z)));
-}
-
-template <>
-inline float Vec3<float>::Length() const {
-    return std::sqrt(x * x + y * y + z * z);
-}
-
-template <>
-inline Vec3<float> Vec3<float>::Normalized() const {
-    return *this / Length();
-}
-
-template <>
-inline float Vec3<float>::Normalize() {
-    float length = Length();
-    *this /= length;
-    return length;
-}
-
-using Vec3f = Vec3<float>;
-
-template <typename T>
-class Vec4 {
-public:
-    T x{};
-    T y{};
-    T z{};
-    T w{};
-
-    constexpr Vec4() = default;
-    constexpr Vec4(const T& x_, const T& y_, const T& z_, const T& w_)
-        : x(x_), y(y_), z(z_), w(w_) {}
-
-    template <typename T2>
-    [[nodiscard]] constexpr Vec4<T2> Cast() const {
-        return Vec4<T2>(static_cast<T2>(x), static_cast<T2>(y), static_cast<T2>(z),
-                        static_cast<T2>(w));
-    }
-
-    [[nodiscard]] static constexpr Vec4 AssignToAll(const T& f) {
-        return Vec4(f, f, f, f);
-    }
-
-    [[nodiscard]] constexpr Vec4<decltype(T{} + T{})> operator+(const Vec4& other) const {
-        return {x + other.x, y + other.y, z + other.z, w + other.w};
-    }
-
-    constexpr Vec4& operator+=(const Vec4& other) {
-        x += other.x;
-        y += other.y;
-        z += other.z;
-        w += other.w;
-        return *this;
-    }
-
-    [[nodiscard]] constexpr Vec4<decltype(T{} - T{})> operator-(const Vec4& other) const {
-        return {x - other.x, y - other.y, z - other.z, w - other.w};
-    }
-
-    constexpr Vec4& operator-=(const Vec4& other) {
-        x -= other.x;
-        y -= other.y;
-        z -= other.z;
-        w -= other.w;
-        return *this;
-    }
-
-    template <typename U = T>
-    [[nodiscard]] constexpr Vec4<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const {
-        return {-x, -y, -z, -w};
-    }
-
-    [[nodiscard]] constexpr Vec4<decltype(T{} * T{})> operator*(const Vec4& other) const {
-        return {x * other.x, y * other.y, z * other.z, w * other.w};
-    }
-
-    template <typename V>
-    [[nodiscard]] constexpr Vec4<decltype(T{} * V{})> operator*(const V& f) const {
-        using TV = decltype(T{} * V{});
-        using C = std::common_type_t<T, V>;
-
-        return {
-            static_cast<TV>(static_cast<C>(x) * static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(y) * static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(z) * static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(w) * static_cast<C>(f)),
-        };
-    }
-
-    template <typename V>
-    constexpr Vec4& operator*=(const V& f) {
-        *this = *this * f;
-        return *this;
-    }
-
-    template <typename V>
-    [[nodiscard]] constexpr Vec4<decltype(T{} / V{})> operator/(const V& f) const {
-        using TV = decltype(T{} / V{});
-        using C = std::common_type_t<T, V>;
-
-        return {
-            static_cast<TV>(static_cast<C>(x) / static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(y) / static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(z) / static_cast<C>(f)),
-            static_cast<TV>(static_cast<C>(w) / static_cast<C>(f)),
-        };
-    }
-
-    template <typename V>
-    constexpr Vec4& operator/=(const V& f) {
-        *this = *this / f;
-        return *this;
-    }
-
-    [[nodiscard]] constexpr T Length2() const {
-        return x * x + y * y + z * z + w * w;
-    }
-
-    [[nodiscard]] constexpr T& operator[](std::size_t i) {
-        return *((&x) + i);
-    }
-
-    [[nodiscard]] constexpr const T& operator[](std::size_t i) const {
-        return *((&x) + i);
-    }
-
-    constexpr void SetZero() {
-        x = 0;
-        y = 0;
-        z = 0;
-        w = 0;
-    }
-
-    // Common alias: RGBA (colors)
-    [[nodiscard]] constexpr T& r() {
-        return x;
-    }
-    [[nodiscard]] constexpr T& g() {
-        return y;
-    }
-    [[nodiscard]] constexpr T& b() {
-        return z;
-    }
-    [[nodiscard]] constexpr T& a() {
-        return w;
-    }
-
-    [[nodiscard]] constexpr const T& r() const {
-        return x;
-    }
-    [[nodiscard]] constexpr const T& g() const {
-        return y;
-    }
-    [[nodiscard]] constexpr const T& b() const {
-        return z;
-    }
-    [[nodiscard]] constexpr const T& a() const {
-        return w;
-    }
-
-// Swizzlers - Create a subvector of specific components
-// e.g. Vec2 uv() { return Vec2(x,y); }
-
-// _DEFINE_SWIZZLER2 defines a single such function
-// DEFINE_SWIZZLER2_COMP1 defines one-component functions for all component names (x<->r)
-// DEFINE_SWIZZLER2_COMP2 defines two component functions for all component names (x<->r) and
-// permutations (xy<->yx)
-#define _DEFINE_SWIZZLER2(a, b, name)                                                              \
-    [[nodiscard]] constexpr Vec2<T> name() const { return Vec2<T>(a, b); }
-#define DEFINE_SWIZZLER2_COMP1(a, a2)                                                              \
-    _DEFINE_SWIZZLER2(a, a, a##a);                                                                 \
-    _DEFINE_SWIZZLER2(a, a, a2##a2)
-#define DEFINE_SWIZZLER2_COMP2(a, b, a2, b2)                                                       \
-    _DEFINE_SWIZZLER2(a, b, a##b);                                                                 \
-    _DEFINE_SWIZZLER2(a, b, a2##b2);                                                               \
-    _DEFINE_SWIZZLER2(b, a, b##a);                                                                 \
-    _DEFINE_SWIZZLER2(b, a, b2##a2)
-
-    DEFINE_SWIZZLER2_COMP2(x, y, r, g);
-    DEFINE_SWIZZLER2_COMP2(x, z, r, b);
-    DEFINE_SWIZZLER2_COMP2(x, w, r, a);
-    DEFINE_SWIZZLER2_COMP2(y, z, g, b);
-    DEFINE_SWIZZLER2_COMP2(y, w, g, a);
-    DEFINE_SWIZZLER2_COMP2(z, w, b, a);
-    DEFINE_SWIZZLER2_COMP1(x, r);
-    DEFINE_SWIZZLER2_COMP1(y, g);
-    DEFINE_SWIZZLER2_COMP1(z, b);
-    DEFINE_SWIZZLER2_COMP1(w, a);
-#undef DEFINE_SWIZZLER2_COMP1
-#undef DEFINE_SWIZZLER2_COMP2
-#undef _DEFINE_SWIZZLER2
-
-#define _DEFINE_SWIZZLER3(a, b, c, name)                                                           \
-    [[nodiscard]] constexpr Vec3<T> name() const { return Vec3<T>(a, b, c); }
-#define DEFINE_SWIZZLER3_COMP1(a, a2)                                                              \
-    _DEFINE_SWIZZLER3(a, a, a, a##a##a);                                                           \
-    _DEFINE_SWIZZLER3(a, a, a, a2##a2##a2)
-#define DEFINE_SWIZZLER3_COMP3(a, b, c, a2, b2, c2)                                                \
-    _DEFINE_SWIZZLER3(a, b, c, a##b##c);                                                           \
-    _DEFINE_SWIZZLER3(a, c, b, a##c##b);                                                           \
-    _DEFINE_SWIZZLER3(b, a, c, b##a##c);                                                           \
-    _DEFINE_SWIZZLER3(b, c, a, b##c##a);                                                           \
-    _DEFINE_SWIZZLER3(c, a, b, c##a##b);                                                           \
-    _DEFINE_SWIZZLER3(c, b, a, c##b##a);                                                           \
-    _DEFINE_SWIZZLER3(a, b, c, a2##b2##c2);                                                        \
-    _DEFINE_SWIZZLER3(a, c, b, a2##c2##b2);                                                        \
-    _DEFINE_SWIZZLER3(b, a, c, b2##a2##c2);                                                        \
-    _DEFINE_SWIZZLER3(b, c, a, b2##c2##a2);                                                        \
-    _DEFINE_SWIZZLER3(c, a, b, c2##a2##b2);                                                        \
-    _DEFINE_SWIZZLER3(c, b, a, c2##b2##a2)
-
-    DEFINE_SWIZZLER3_COMP3(x, y, z, r, g, b);
-    DEFINE_SWIZZLER3_COMP3(x, y, w, r, g, a);
-    DEFINE_SWIZZLER3_COMP3(x, z, w, r, b, a);
-    DEFINE_SWIZZLER3_COMP3(y, z, w, g, b, a);
-    DEFINE_SWIZZLER3_COMP1(x, r);
-    DEFINE_SWIZZLER3_COMP1(y, g);
-    DEFINE_SWIZZLER3_COMP1(z, b);
-    DEFINE_SWIZZLER3_COMP1(w, a);
-#undef DEFINE_SWIZZLER3_COMP1
-#undef DEFINE_SWIZZLER3_COMP3
-#undef _DEFINE_SWIZZLER3
-};
-
-template <typename T, typename V>
-[[nodiscard]] constexpr Vec4<decltype(V{} * T{})> operator*(const V& f, const Vec4<T>& vec) {
-    using TV = decltype(V{} * T{});
-    using C = std::common_type_t<T, V>;
-
-    return {
-        static_cast<TV>(static_cast<C>(f) * static_cast<C>(vec.x)),
-        static_cast<TV>(static_cast<C>(f) * static_cast<C>(vec.y)),
-        static_cast<TV>(static_cast<C>(f) * static_cast<C>(vec.z)),
-        static_cast<TV>(static_cast<C>(f) * static_cast<C>(vec.w)),
-    };
-}
-
-using Vec4f = Vec4<float>;
-
-template <typename T>
-constexpr decltype(T{} * T{} + T{} * T{}) Dot(const Vec2<T>& a, const Vec2<T>& b) {
-    return a.x * b.x + a.y * b.y;
-}
-
-template <typename T>
-[[nodiscard]] constexpr decltype(T{} * T{} + T{} * T{}) Dot(const Vec3<T>& a, const Vec3<T>& b) {
-    return a.x * b.x + a.y * b.y + a.z * b.z;
-}
-
-template <typename T>
-[[nodiscard]] constexpr decltype(T{} * T{} + T{} * T{}) Dot(const Vec4<T>& a, const Vec4<T>& b) {
-    return a.x * b.x + a.y * b.y + a.z * b.z + a.w * b.w;
-}
-
-template <>
-[[nodiscard]] inline float Dot(const Vec4<float>& a, const Vec4<float>& b) {
-#ifdef __ARM_NEON
-    float32x4_t va = vld1q_f32(&a.x);
-    float32x4_t vb = vld1q_f32(&b.x);
-    float32x4_t result = vmulq_f32(va, vb);
-#if defined(__aarch64__) // Use vaddvq_f32 in ARMv8 architectures
-    return vaddvq_f32(result);
-#else // Use manual addition for older architectures
-    float32x2_t sum2 = vadd_f32(vget_high_f32(result), vget_low_f32(result));
-    return vget_lane_f32(vpadd_f32(sum2, sum2), 0);
-#endif
-#else
-    return a.x * b.x + a.y * b.y + a.z * b.z + a.w * b.w;
-#endif
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec3<decltype(T{} * T{} - T{} * T{})> Cross(const Vec3<T>& a,
-                                                                    const Vec3<T>& b) {
-    return {a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x};
-}
-
-// linear interpolation via float: 0.0=begin, 1.0=end
-template <typename X>
-[[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) Lerp(const X& begin, const X& end,
-                                                                     const float t) {
-    return begin * (1.f - t) + end * t;
-}
-
-// linear interpolation via int: 0=begin, base=end
-template <typename X, int base>
-[[nodiscard]] constexpr decltype((X{} * int{} + X{} * int{}) / base) LerpInt(const X& begin,
-                                                                             const X& end,
-                                                                             const int t) {
-    return (begin * (base - t) + end * t) / base;
-}
-
-// bilinear interpolation. s is for interpolating x00-x01 and x10-x11, and t is for the second
-// interpolation.
-template <typename X>
-[[nodiscard]] constexpr auto BilinearInterp(const X& x00, const X& x01, const X& x10, const X& x11,
-                                            const float s, const float t) {
-    auto y0 = Lerp(x00, x01, s);
-    auto y1 = Lerp(x10, x11, s);
-    return Lerp(y0, y1, t);
-}
-
-// Utility vector factories
-template <typename T>
-[[nodiscard]] constexpr Vec2<T> MakeVec(const T& x, const T& y) {
-    return Vec2<T>{x, y};
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec3<T> MakeVec(const T& x, const T& y, const T& z) {
-    return Vec3<T>{x, y, z};
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const T& x, const T& y, const Vec2<T>& zw) {
-    return MakeVec(x, y, zw[0], zw[1]);
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec3<T> MakeVec(const Vec2<T>& xy, const T& z) {
-    return MakeVec(xy[0], xy[1], z);
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec3<T> MakeVec(const T& x, const Vec2<T>& yz) {
-    return MakeVec(x, yz[0], yz[1]);
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const T& x, const T& y, const T& z, const T& w) {
-    return Vec4<T>{x, y, z, w};
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const Vec2<T>& xy, const T& z, const T& w) {
-    return MakeVec(xy[0], xy[1], z, w);
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const T& x, const Vec2<T>& yz, const T& w) {
-    return MakeVec(x, yz[0], yz[1], w);
-}
-
-// NOTE: This has priority over "Vec2<Vec2<T>> MakeVec(const Vec2<T>& x, const Vec2<T>& y)".
-//       Even if someone wanted to use an odd object like Vec2<Vec2<T>>, the compiler would error
-//       out soon enough due to misuse of the returned structure.
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const Vec2<T>& xy, const Vec2<T>& zw) {
-    return MakeVec(xy[0], xy[1], zw[0], zw[1]);
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const Vec3<T>& xyz, const T& w) {
-    return MakeVec(xyz[0], xyz[1], xyz[2], w);
-}
-
-template <typename T>
-[[nodiscard]] constexpr Vec4<T> MakeVec(const T& x, const Vec3<T>& yzw) {
-    return MakeVec(x, yzw[0], yzw[1], yzw[2]);
 }
 
 } // namespace Common

src/core/hle/service/set/setting_formats/device_settings.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -30,15 +33,15 @@ struct DeviceSettings {
     INSERT_PADDING_BYTES(0x20); // Reserved
 
     // nn::settings::system::ConsoleSixAxisSensorAccelerationBias
-    Common::Vec3<f32> console_six_axis_sensor_acceleration_bias;
+    Common::Vec<f32, 3> console_six_axis_sensor_acceleration_bias;
     // nn::settings::system::ConsoleSixAxisSensorAngularVelocityBias
-    Common::Vec3<f32> console_six_axis_sensor_angular_velocity_bias;
+    Common::Vec<f32, 3> console_six_axis_sensor_angular_velocity_bias;
     // nn::settings::system::ConsoleSixAxisSensorAccelerationGain
     std::array<u8, 0x24> console_six_axis_sensor_acceleration_gain;
     // nn::settings::system::ConsoleSixAxisSensorAngularVelocityGain
     std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_gain;
     // nn::settings::system::ConsoleSixAxisSensorAngularVelocityTimeBias
-    Common::Vec3<f32> console_six_axis_sensor_angular_velocity_time_bias;
+    Common::Vec<f32, 3> console_six_axis_sensor_angular_velocity_time_bias;
     // nn::settings::system::ConsoleSixAxisSensorAngularAcceleration
     std::array<u8, 0x24> console_six_axis_sensor_angular_acceleration;
 };

src/core/hle/service/set/setting_formats/system_settings.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -153,15 +153,15 @@ struct SystemSettings {
     INSERT_PADDING_BYTES(0x7FF8); // Reserved
 
     // nn::settings::system::ConsoleSixAxisSensorAccelerationBias
-    Common::Vec3<f32> console_six_axis_sensor_acceleration_bias;
+    Common::Vec<f32, 3> console_six_axis_sensor_acceleration_bias;
     // nn::settings::system::ConsoleSixAxisSensorAngularVelocityBias
-    Common::Vec3<f32> console_six_axis_sensor_angular_velocity_bias;
+    Common::Vec<f32, 3> console_six_axis_sensor_angular_velocity_bias;
     // nn::settings::system::ConsoleSixAxisSensorAccelerationGain
     std::array<u8, 0x24> console_six_axis_sensor_acceleration_gain;
     // nn::settings::system::ConsoleSixAxisSensorAngularVelocityGain
     std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_gain;
     // nn::settings::system::ConsoleSixAxisSensorAngularVelocityTimeBias
-    Common::Vec3<f32> console_six_axis_sensor_angular_velocity_time_bias;
+    Common::Vec<f32, 3> console_six_axis_sensor_angular_velocity_time_bias;
     // nn::settings::system::ConsoleSixAxisSensorAngularAcceleration
     std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_acceleration;
     INSERT_PADDING_BYTES(0x70); // Reserved

src/hid_core/frontend/emulated_console.cpp

@@ -170,12 +170,12 @@ void EmulatedConsole::SetMotion(const Common::Input::CallbackStatus& callback) {
     auto& emulated = console.motion_values.emulated;
 
     raw_status = TransformToMotion(callback);
-    emulated.SetAcceleration(Common::Vec3f{
+    emulated.SetAcceleration(Common::Vec<f32, 3>{
         raw_status.accel.x.value,
         raw_status.accel.y.value,
         raw_status.accel.z.value,
     });
-    emulated.SetGyroscope(Common::Vec3f{
+    emulated.SetGyroscope(Common::Vec<f32, 3>{
         raw_status.gyro.x.value,
         raw_status.gyro.y.value,
         raw_status.gyro.z.value,

src/hid_core/frontend/emulated_console.h

@@ -18,7 +18,6 @@
 #include "common/input.h"
 #include "common/param_package.h"
 #include "common/point.h"
-#include "common/quaternion.h"
 #include "common/vector_math.h"
 #include "hid_core/frontend/motion_input.h"
 #include "hid_core/hid_types.h"
@@ -43,12 +42,12 @@ using TouchValues = std::array<Common::Input::TouchStatus, MaxTouchDevices>;
 
 // Contains all motion related data that is used on the services
 struct ConsoleMotion {
-    Common::Vec3f accel{};
+    Common::Vec<f32, 3> accel{};
-    Common::Vec3f gyro{};
+    Common::Vec<f32, 3> gyro{};
-    Common::Vec3f rotation{};
+    Common::Vec<f32, 3> rotation{};
-    std::array<Common::Vec3f, 3> orientation{};
+    std::array<Common::Vec<f32, 3>, 3> orientation{};
-    Common::Quaternion<f32> quaternion{};
+    Common::Vec<f32, 4> quaternion{};
-    Common::Vec3f gyro_bias{};
+    Common::Vec<f32, 3> gyro_bias{};
     f32 verticalization_error{};
     bool is_at_rest{};
 };

src/hid_core/frontend/emulated_controller.cpp

@@ -1051,12 +1051,12 @@ void EmulatedController::SetMotion(const Common::Input::CallbackStatus& callback
     auto& emulated = controller.motion_values[index].emulated;
 
     raw_status = TransformToMotion(callback);
-    emulated.SetAcceleration(Common::Vec3f{
+    emulated.SetAcceleration(Common::Vec<f32, 3>{
         raw_status.accel.x.value,
         raw_status.accel.y.value,
         raw_status.accel.z.value,
     });
-    emulated.SetGyroscope(Common::Vec3f{
+    emulated.SetGyroscope(Common::Vec<f32, 3>{
         raw_status.gyro.x.value,
         raw_status.gyro.y.value,
         raw_status.gyro.z.value,

src/hid_core/frontend/emulated_controller.h

@@ -107,11 +107,11 @@ struct RingSensorForce {
 using NfcState = Common::Input::NfcStatus;
 
 struct ControllerMotion {
-    Common::Vec3f accel{};
+    Common::Vec<f32, 3> accel{};
-    Common::Vec3f gyro{};
+    Common::Vec<f32, 3> gyro{};
-    Common::Vec3f rotation{};
+    Common::Vec<f32, 3> rotation{};
-    Common::Vec3f euler{};
+    Common::Vec<f32, 3> euler{};
-    std::array<Common::Vec3f, 3> orientation{};
+    std::array<Common::Vec<f32, 3>, 3> orientation{};
     bool is_at_rest{};
 };
 

src/hid_core/frontend/motion_input.cpp

@@ -26,20 +26,19 @@ void MotionInput::SetPID(f32 new_kp, f32 new_ki, f32 new_kd) {
     kd = new_kd;
 }
 
-void MotionInput::SetAcceleration(const Common::Vec3f& acceleration) {
+void MotionInput::SetAcceleration(const Common::Vec<f32, 3>& acceleration) {
     accel = acceleration;
-
+    accel[0] = std::clamp(accel[0], -AccelMaxValue, AccelMaxValue);
-    accel.x = std::clamp(accel.x, -AccelMaxValue, AccelMaxValue);
+    accel[1] = std::clamp(accel[1], -AccelMaxValue, AccelMaxValue);
-    accel.y = std::clamp(accel.y, -AccelMaxValue, AccelMaxValue);
+    accel[2] = std::clamp(accel[2], -AccelMaxValue, AccelMaxValue);
-    accel.z = std::clamp(accel.z, -AccelMaxValue, AccelMaxValue);
 }
 
-void MotionInput::SetGyroscope(const Common::Vec3f& gyroscope) {
+void MotionInput::SetGyroscope(const Common::Vec<f32, 3>& gyroscope) {
     gyro = gyroscope - gyro_bias;
 
-    gyro.x = std::clamp(gyro.x, -GyroMaxValue, GyroMaxValue);
+    gyro[0] = std::clamp(gyro[0], -GyroMaxValue, GyroMaxValue);
-    gyro.y = std::clamp(gyro.y, -GyroMaxValue, GyroMaxValue);
+    gyro[1] = std::clamp(gyro[1], -GyroMaxValue, GyroMaxValue);
-    gyro.z = std::clamp(gyro.z, -GyroMaxValue, GyroMaxValue);
+    gyro[2] = std::clamp(gyro[2], -GyroMaxValue, GyroMaxValue);
 
     // Auto adjust gyro_bias to minimize drift
     if (!IsMoving(IsAtRestRelaxed)) {
@@ -59,25 +58,25 @@ void MotionInput::SetGyroscope(const Common::Vec3f& gyroscope) {
     }
 }
 
-void MotionInput::SetQuaternion(const Common::Quaternion<f32>& quaternion) {
+void MotionInput::SetQuaternion(const Common::Vec<f32, 4>& quaternion) {
     quat = quaternion;
 }
 
-void MotionInput::SetEulerAngles(const Common::Vec3f& euler_angles) {
+void MotionInput::SetEulerAngles(const Common::Vec<f32, 3>& euler_angles) {
-    const float cr = std::cos(euler_angles.x * 0.5f);
+    const float cr = std::cos(euler_angles[0] * 0.5f);
-    const float sr = std::sin(euler_angles.x * 0.5f);
+    const float sr = std::sin(euler_angles[0] * 0.5f);
-    const float cp = std::cos(euler_angles.y * 0.5f);
+    const float cp = std::cos(euler_angles[1] * 0.5f);
-    const float sp = std::sin(euler_angles.y * 0.5f);
+    const float sp = std::sin(euler_angles[1] * 0.5f);
-    const float cy = std::cos(euler_angles.z * 0.5f);
+    const float cy = std::cos(euler_angles[2] * 0.5f);
-    const float sy = std::sin(euler_angles.z * 0.5f);
+    const float sy = std::sin(euler_angles[2] * 0.5f);
 
-    quat.w = cr * cp * cy + sr * sp * sy;
+    quat[3] = cr * cp * cy + sr * sp * sy;
-    quat.xyz.x = sr * cp * cy - cr * sp * sy;
+    quat[0] = sr * cp * cy - cr * sp * sy;
-    quat.xyz.y = cr * sp * cy + sr * cp * sy;
+    quat[1] = cr * sp * cy + sr * cp * sy;
-    quat.xyz.z = cr * cp * sy - sr * sp * cy;
+    quat[2] = cr * cp * sy - sr * sp * cy;
 }
 
-void MotionInput::SetGyroBias(const Common::Vec3f& bias) {
+void MotionInput::SetGyroBias(const Common::Vec<f32, 3>& bias) {
     gyro_bias = bias;
 }
 
@@ -98,7 +97,7 @@ void MotionInput::ResetRotations() {
 }
 
 void MotionInput::ResetQuaternion() {
-    quat = {{0.0f, 0.0f, -1.0f}, 0.0f};
+    quat = Common::Vec<f32, 4>{0.0f, 0.0f, -1.0f, 0.0f};
 }
 
 bool MotionInput::IsMoving(f32 sensitivity) const {
@@ -137,10 +136,10 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
         ResetOrientation();
     }
     // Short name local variable for readability
-    f32 q1 = quat.w;
+    f32 q1 = quat[3];
-    f32 q2 = quat.xyz[0];
+    f32 q2 = quat[0];
-    f32 q3 = quat.xyz[1];
+    f32 q3 = quat[1];
-    f32 q4 = quat.xyz[2];
+    f32 q4 = quat[2];
     const auto sample_period = static_cast<f32>(elapsed_time) / 1000000.0f;
 
     // Ignore invalid elapsed time
@@ -150,23 +149,23 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
 
     const auto normal_accel = accel.Normalized();
     auto rad_gyro = gyro * std::numbers::pi_v<float> * 2.f;
-    const f32 swap = rad_gyro.x;
+    const f32 swap = rad_gyro[0];
-    rad_gyro.x = rad_gyro.y;
+    rad_gyro[0] = rad_gyro[1];
-    rad_gyro.y = -swap;
+    rad_gyro[1] = -swap;
-    rad_gyro.z = -rad_gyro.z;
+    rad_gyro[2] = -rad_gyro[2];
 
     // Clear gyro values if there is no gyro present
     if (only_accelerometer) {
-        rad_gyro.x = 0;
+        rad_gyro[0] = 0;
-        rad_gyro.y = 0;
+        rad_gyro[1] = 0;
-        rad_gyro.z = 0;
+        rad_gyro[2] = 0;
     }
 
     // Ignore drift correction if acceleration is not reliable
     if (accel.Length() >= 0.75f && accel.Length() <= 1.25f) {
-        const f32 ax = -normal_accel.x;
+        const f32 ax = -normal_accel[0];
-        const f32 ay = normal_accel.y;
+        const f32 ay = normal_accel[1];
-        const f32 az = -normal_accel.z;
+        const f32 az = -normal_accel[2];
 
         // Estimated direction of gravity
         const f32 vx = 2.0f * (q2 * q4 - q1 * q3);
@@ -174,7 +173,7 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
         const f32 vz = q1 * q1 - q2 * q2 - q3 * q3 + q4 * q4;
 
         // Error is cross product between estimated direction and measured direction of gravity
-        const Common::Vec3f new_real_error = {
+        const Common::Vec<f32, 3> new_real_error{
             az * vx - ax * vz,
             ay * vz - az * vy,
             ax * vy - ay * vx,
@@ -202,16 +201,16 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
             rad_gyro += 10.0f * kd * derivative_error;
 
             // Emulate gyro values for games that need them
-            gyro.x = -rad_gyro.y;
+            gyro[0] = -rad_gyro[1];
-            gyro.y = rad_gyro.x;
+            gyro[1] = rad_gyro[0];
-            gyro.z = -rad_gyro.z;
+            gyro[2] = -rad_gyro[2];
             UpdateRotation(elapsed_time);
         }
     }
 
-    const f32 gx = rad_gyro.y;
+    const f32 gx = rad_gyro[1];
-    const f32 gy = rad_gyro.x;
+    const f32 gy = rad_gyro[0];
-    const f32 gz = rad_gyro.z;
+    const f32 gz = rad_gyro[2];
 
     // Integrate rate of change of quaternion
     const f32 pa = q2;
@@ -222,57 +221,58 @@ void MotionInput::UpdateOrientation(u64 elapsed_time) {
     q3 = pb + (q1 * gy - pa * gz + pc * gx) * (0.5f * sample_period);
     q4 = pc + (q1 * gz + pa * gy - pb * gx) * (0.5f * sample_period);
 
-    quat.w = q1;
+    quat[3] = q1;
-    quat.xyz[0] = q2;
+    quat[0] = q2;
-    quat.xyz[1] = q3;
+    quat[1] = q3;
-    quat.xyz[2] = q4;
+    quat[2] = q4;
     quat = quat.Normalized();
 }
 
-std::array<Common::Vec3f, 3> MotionInput::GetOrientation() const {
+std::array<Common::Vec<f32, 3>, 3> MotionInput::GetOrientation() const {
-    const Common::Quaternion<float> quad{
+    const Common::Vec<f32, 4> quad{
-        .xyz = {-quat.xyz[1], -quat.xyz[0], -quat.w},
+        -quat[1],
-        .w = -quat.xyz[2],
+        -quat[0],
+        -quat[3],
+        -quat[2],
     };
-    const std::array<float, 16> matrix4x4 = quad.ToMatrix();
+    const std::array<f32, 16> matrix4x4 = quad.ToMatrix();
-
+    return {Common::Vec<f32, 3>(matrix4x4[0], matrix4x4[1], -matrix4x4[2]),
-    return {Common::Vec3f(matrix4x4[0], matrix4x4[1], -matrix4x4[2]),
+            Common::Vec<f32, 3>(matrix4x4[4], matrix4x4[5], -matrix4x4[6]),
-            Common::Vec3f(matrix4x4[4], matrix4x4[5], -matrix4x4[6]),
+            Common::Vec<f32, 3>(-matrix4x4[8], -matrix4x4[9], matrix4x4[10])};
-            Common::Vec3f(-matrix4x4[8], -matrix4x4[9], matrix4x4[10])};
 }
 
-Common::Vec3f MotionInput::GetAcceleration() const {
+Common::Vec<f32, 3> MotionInput::GetAcceleration() const {
     return accel;
 }
 
-Common::Vec3f MotionInput::GetGyroscope() const {
+Common::Vec<f32, 3> MotionInput::GetGyroscope() const {
     return gyro;
 }
 
-Common::Vec3f MotionInput::GetGyroBias() const {
+Common::Vec<f32, 3> MotionInput::GetGyroBias() const {
     return gyro_bias;
 }
 
-Common::Quaternion<f32> MotionInput::GetQuaternion() const {
+Common::Vec<f32, 4> MotionInput::GetQuaternion() const {
     return quat;
 }
 
-Common::Vec3f MotionInput::GetRotations() const {
+Common::Vec<f32, 3> MotionInput::GetRotations() const {
     return rotations;
 }
 
-Common::Vec3f MotionInput::GetEulerAngles() const {
+Common::Vec<f32, 3> MotionInput::GetEulerAngles() const {
     // roll (x-axis rotation)
-    const float sinr_cosp = 2 * (quat.w * quat.xyz.x + quat.xyz.y * quat.xyz.z);
+    const float sinr_cosp = 2 * (quat[3] * quat[0] + quat[1] * quat[2]);
-    const float cosr_cosp = 1 - 2 * (quat.xyz.x * quat.xyz.x + quat.xyz.y * quat.xyz.y);
+    const float cosr_cosp = 1 - 2 * (quat[0] * quat[0] + quat[1] * quat[1]);
 
     // pitch (y-axis rotation)
-    const float sinp = std::sqrt(1 + 2 * (quat.w * quat.xyz.y - quat.xyz.x * quat.xyz.z));
+    const float sinp = std::sqrt(1 + 2 * (quat[3] * quat[1] - quat[0] * quat[2]));
-    const float cosp = std::sqrt(1 - 2 * (quat.w * quat.xyz.y - quat.xyz.x * quat.xyz.z));
+    const float cosp = std::sqrt(1 - 2 * (quat[3] * quat[1] - quat[0] * quat[2]));
 
     // yaw (z-axis rotation)
-    const float siny_cosp = 2 * (quat.w * quat.xyz.z + quat.xyz.x * quat.xyz.y);
+    const float siny_cosp = 2 * (quat[3] * quat[2] + quat[0] * quat[1]);
-    const float cosy_cosp = 1 - 2 * (quat.xyz.y * quat.xyz.y + quat.xyz.z * quat.xyz.z);
+    const float cosy_cosp = 1 - 2 * (quat[1] * quat[1] + quat[2] * quat[2]);
 
     return {
         std::atan2(sinr_cosp, cosr_cosp),
@@ -285,13 +285,13 @@ void MotionInput::ResetOrientation() {
     if (!reset_enabled || only_accelerometer) {
         return;
     }
-    if (!IsMoving(IsAtRestRelaxed) && accel.z <= -0.9f) {
+    if (!IsMoving(IsAtRestRelaxed) && accel[2] <= -0.9f) {
         ++reset_counter;
         if (reset_counter > 900) {
-            quat.w = 0;
+            quat[3] = 0;
-            quat.xyz[0] = 0;
+            quat[0] = 0;
-            quat.xyz[1] = 0;
+            quat[1] = 0;
-            quat.xyz[2] = -1;
+            quat[2] = -1;
             SetOrientationFromAccelerometer();
             integral_error = {};
             reset_counter = 0;
@@ -309,15 +309,15 @@ void MotionInput::SetOrientationFromAccelerometer() {
 
     while (!IsCalibrated(0.01f) && ++iterations < 100) {
         // Short name local variable for readability
-        f32 q1 = quat.w;
+        f32 q1 = quat[3];
-        f32 q2 = quat.xyz[0];
+        f32 q2 = quat[0];
-        f32 q3 = quat.xyz[1];
+        f32 q3 = quat[1];
-        f32 q4 = quat.xyz[2];
+        f32 q4 = quat[2];
 
-        Common::Vec3f rad_gyro;
+        Common::Vec<f32, 3> rad_gyro;
-        const f32 ax = -normal_accel.x;
+        const f32 ax = -normal_accel[0];
-        const f32 ay = normal_accel.y;
+        const f32 ay = normal_accel[1];
-        const f32 az = -normal_accel.z;
+        const f32 az = -normal_accel[2];
 
         // Estimated direction of gravity
         const f32 vx = 2.0f * (q2 * q4 - q1 * q3);
@@ -325,7 +325,7 @@ void MotionInput::SetOrientationFromAccelerometer() {
         const f32 vz = q1 * q1 - q2 * q2 - q3 * q3 + q4 * q4;
 
         // Error is cross product between estimated direction and measured direction of gravity
-        const Common::Vec3f new_real_error = {
+        const Common::Vec<f32, 3> new_real_error = {
             az * vx - ax * vz,
             ay * vz - az * vy,
             ax * vy - ay * vx,
@@ -338,9 +338,9 @@ void MotionInput::SetOrientationFromAccelerometer() {
         rad_gyro += 5.0f * ki * integral_error;
         rad_gyro += 10.0f * kd * derivative_error;
 
-        const f32 gx = rad_gyro.y;
+        const f32 gx = rad_gyro[1];
-        const f32 gy = rad_gyro.x;
+        const f32 gy = rad_gyro[0];
-        const f32 gz = rad_gyro.z;
+        const f32 gz = rad_gyro[2];
 
         // Integrate rate of change of quaternion
         const f32 pa = q2;
@@ -351,10 +351,10 @@ void MotionInput::SetOrientationFromAccelerometer() {
         q3 = pb + (q1 * gy - pa * gz + pc * gx) * (0.5f * sample_period);
         q4 = pc + (q1 * gz + pa * gy - pb * gx) * (0.5f * sample_period);
 
-        quat.w = q1;
+        quat[3] = q1;
-        quat.xyz[0] = q2;
+        quat[0] = q2;
-        quat.xyz[1] = q3;
+        quat[1] = q3;
-        quat.xyz[2] = q4;
+        quat[2] = q4;
         quat = quat.Normalized();
     }
 }

src/hid_core/frontend/motion_input.h

@@ -1,10 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "common/common_types.h"
-#include "common/quaternion.h"
 #include "common/vector_math.h"
 
 namespace Core::HID {
@@ -34,11 +36,11 @@ public:
     MotionInput& operator=(MotionInput&&) = default;
 
     void SetPID(f32 new_kp, f32 new_ki, f32 new_kd);
-    void SetAcceleration(const Common::Vec3f& acceleration);
+    void SetAcceleration(const Common::Vec<f32, 3>& acceleration);
-    void SetGyroscope(const Common::Vec3f& gyroscope);
+    void SetGyroscope(const Common::Vec<f32, 3>& gyroscope);
-    void SetQuaternion(const Common::Quaternion<f32>& quaternion);
+    void SetQuaternion(const Common::Vec<f32, 4>& quaternion);
-    void SetEulerAngles(const Common::Vec3f& euler_angles);
+    void SetEulerAngles(const Common::Vec<f32, 3>& euler_angles);
-    void SetGyroBias(const Common::Vec3f& bias);
+    void SetGyroBias(const Common::Vec<f32, 3>& bias);
     void SetGyroThreshold(f32 threshold);
 
     /// Applies a modifier on top of the normal gyro threshold
@@ -53,13 +55,13 @@ public:
 
     void Calibrate();
 
-    [[nodiscard]] std::array<Common::Vec3f, 3> GetOrientation() const;
+    [[nodiscard]] std::array<Common::Vec<f32, 3>, 3> GetOrientation() const;
-    [[nodiscard]] Common::Vec3f GetAcceleration() const;
+    [[nodiscard]] Common::Vec<f32, 3> GetAcceleration() const;
-    [[nodiscard]] Common::Vec3f GetGyroscope() const;
+    [[nodiscard]] Common::Vec<f32, 3> GetGyroscope() const;
-    [[nodiscard]] Common::Vec3f GetGyroBias() const;
+    [[nodiscard]] Common::Vec<f32, 3> GetGyroBias() const;
-    [[nodiscard]] Common::Vec3f GetRotations() const;
+    [[nodiscard]] Common::Vec<f32, 3> GetRotations() const;
-    [[nodiscard]] Common::Quaternion<f32> GetQuaternion() const;
+    [[nodiscard]] Common::Vec<f32, 4> GetQuaternion() const;
-    [[nodiscard]] Common::Vec3f GetEulerAngles() const;
+    [[nodiscard]] Common::Vec<f32, 3> GetEulerAngles() const;
 
     [[nodiscard]] bool IsMoving(f32 sensitivity) const;
     [[nodiscard]] bool IsCalibrated(f32 sensitivity) const;
@@ -75,24 +77,24 @@ private:
     f32 kd;
 
     // PID errors
-    Common::Vec3f real_error;
+    Common::Vec<f32, 3> real_error;
-    Common::Vec3f integral_error;
+    Common::Vec<f32, 3> integral_error;
-    Common::Vec3f derivative_error;
+    Common::Vec<f32, 3> derivative_error;
 
     // Quaternion containing the device orientation
-    Common::Quaternion<f32> quat;
+    Common::Vec<f32, 4> quat;
 
     // Number of full rotations in each axis
-    Common::Vec3f rotations;
+    Common::Vec<f32, 3> rotations;
 
     // Acceleration vector measurement in G force
-    Common::Vec3f accel;
+    Common::Vec<f32, 3> accel;
 
     // Gyroscope vector measurement in radians/s.
-    Common::Vec3f gyro;
+    Common::Vec<f32, 3> gyro;
 
     // Vector to be subtracted from gyro measurements
-    Common::Vec3f gyro_bias;
+    Common::Vec<f32, 3> gyro_bias;
 
     // Minimum gyro amplitude to detect if the device is moving
     f32 gyro_threshold = 0.0f;

src/hid_core/hid_types.h

@@ -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
 
@@ -602,10 +605,10 @@ static_assert(sizeof(SixAxisSensorAttribute) == 4, "SixAxisSensorAttribute is an
 struct SixAxisSensorState {
     s64 delta_time{};
     s64 sampling_number{};
-    Common::Vec3f accel{};
+    Common::Vec<f32, 3> accel{};
-    Common::Vec3f gyro{};
+    Common::Vec<f32, 3> gyro{};
-    Common::Vec3f rotation{};
+    Common::Vec<f32, 3> rotation{};
-    std::array<Common::Vec3f, 3> orientation{};
+    std::array<Common::Vec<f32, 3>, 3> orientation{};
     SixAxisSensorAttribute attribute{};
     INSERT_PADDING_BYTES(4); // Reserved
 };

src/hid_core/resources/shared_memory_format.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -196,7 +196,7 @@ struct ConsoleSixAxisSensorSharedMemoryFormat {
     bool is_seven_six_axis_sensor_at_rest{};
     INSERT_PADDING_BYTES(3); // padding
     f32 verticalization_error{};
-    Common::Vec3f gyro_bias{};
+    Common::Vec<f32, 3> gyro_bias{};
     INSERT_PADDING_BYTES(4); // padding
 };
 static_assert(sizeof(ConsoleSixAxisSensorSharedMemoryFormat) == 0x20,

src/hid_core/resources/six_axis/seven_six_axis.cpp

@@ -46,14 +46,11 @@ void SevenSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
     next_seven_sixaxis_state.accel = motion_status.accel;
     next_seven_sixaxis_state.gyro = motion_status.gyro;
     next_seven_sixaxis_state.quaternion = {
-        {
+        motion_status.quaternion[1],
-            motion_status.quaternion.xyz.y,
+        motion_status.quaternion[0],
-            motion_status.quaternion.xyz.x,
+        -motion_status.quaternion[3],
-            -motion_status.quaternion.w,
+        -motion_status.quaternion[2],
-        },
-        -motion_status.quaternion.xyz.z,
     };
-
     seven_sixaxis_lifo.WriteNextEntry(next_seven_sixaxis_state);
     transfer_memory_owner->GetMemory().WriteBlock(transfer_memory, &seven_sixaxis_lifo,
                                                   sizeof(seven_sixaxis_lifo));

src/hid_core/resources/six_axis/seven_six_axis.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "common/common_types.h"
-#include "common/quaternion.h"
+#include "common/vector_math.h"
 #include "common/typed_address.h"
 #include "hid_core/resources/controller_base.h"
 #include "hid_core/resources/ring_lifo.h"
@@ -51,9 +51,9 @@ private:
         u64 timestamp{};
         u64 sampling_number{};
         u64 unknown{};
-        Common::Vec3f accel{};
+        Common::Vec<f32, 3> accel{};
-        Common::Vec3f gyro{};
+        Common::Vec<f32, 3> gyro{};
-        Common::Quaternion<f32> quaternion{};
+        Common::Vec<f32, 4> quaternion{};
     };
     static_assert(sizeof(SevenSixAxisState) == 0x48, "SevenSixAxisState is an invalid size");
 

src/hid_core/resources/six_axis/six_axis.cpp

@@ -1,3 +1,6 @@
+// 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-3.0-or-later
 
@@ -93,9 +96,9 @@ void SixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
                     .accel = {0, 0, -1.0f},
                     .orientation =
                         {
-                            Common::Vec3f{1.0f, 0, 0},
+                            Common::Vec<f32, 3>{1.0f, 0, 0},
-                            Common::Vec3f{0, 1.0f, 0},
+                            Common::Vec<f32, 3>{0, 1.0f, 0},
-                            Common::Vec3f{0, 0, 1.0f},
+                            Common::Vec<f32, 3>{0, 0, 1.0f},
                         },
                     .attribute = {1},
                 };

src/input_common/drivers/android.cpp

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

src/input_common/drivers/mouse.cpp

@@ -88,8 +88,8 @@ void Mouse::UpdateStickInput() {
         last_mouse_change *= maximum_stick_range;
     }
 
-    SetAxis(identifier, mouse_axis_x, last_mouse_change.x);
+    SetAxis(identifier, mouse_axis_x, last_mouse_change[0]);
-    SetAxis(identifier, mouse_axis_y, -last_mouse_change.y);
+    SetAxis(identifier, mouse_axis_y, -last_mouse_change[1]);
 
     // Decay input over time
     const float clamped_length = (std::min)(1.0f, length);
@@ -104,20 +104,20 @@ void Mouse::UpdateMotionInput() {
     const float sensitivity =
         IsMousePanningEnabled() ? default_motion_panning_sensitivity : default_motion_sensitivity;
 
-    const float rotation_velocity = std::sqrt(last_motion_change.x * last_motion_change.x +
+    const float rotation_velocity = std::sqrt(last_motion_change[0] * last_motion_change[0] +
-                                              last_motion_change.y * last_motion_change.y);
+                                              last_motion_change[1] * last_motion_change[1]);
 
     // Clamp rotation speed
     if (rotation_velocity > maximum_rotation_speed / sensitivity) {
         const float multiplier = maximum_rotation_speed / rotation_velocity / sensitivity;
-        last_motion_change.x = last_motion_change.x * multiplier;
+        last_motion_change[0] = last_motion_change[0] * multiplier;
-        last_motion_change.y = last_motion_change.y * multiplier;
+        last_motion_change[1] = last_motion_change[1] * multiplier;
     }
 
     const BasicMotion motion_data{
-        .gyro_x = last_motion_change.x * sensitivity,
+        .gyro_x = last_motion_change[0] * sensitivity,
-        .gyro_y = last_motion_change.y * sensitivity,
+        .gyro_y = last_motion_change[1] * sensitivity,
-        .gyro_z = last_motion_change.z * sensitivity,
+        .gyro_z = last_motion_change[2] * sensitivity,
         .accel_x = 0,
         .accel_y = 0,
         .accel_z = 0,
@@ -125,53 +125,46 @@ void Mouse::UpdateMotionInput() {
     };
 
     if (IsMousePanningEnabled()) {
-        last_motion_change.x = 0;
+        last_motion_change[0] = 0;
-        last_motion_change.y = 0;
+        last_motion_change[1] = 0;
     }
-    last_motion_change.z = 0;
+    last_motion_change[2] = 0;
 
     SetMotion(motion_identifier, 0, motion_data);
 }
 
 void Mouse::Move(int x, int y, int center_x, int center_y) {
     if (IsMousePanningEnabled()) {
-        const auto mouse_change =
+        auto const mouse_change_int = Common::Vec<int, 2>(x, y) - Common::Vec<int, 2>(center_x, center_y);
-            (Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast<float>();
+        auto const mouse_change = Common::Vec<float, 2>(float(mouse_change_int[0]), float(mouse_change_int[1]));
-        const float x_sensitivity =
+        auto const x_sensitivity = Settings::values.mouse_panning_x_sensitivity.GetValue() * default_panning_sensitivity;
-            Settings::values.mouse_panning_x_sensitivity.GetValue() * default_panning_sensitivity;
+        auto const y_sensitivity = Settings::values.mouse_panning_y_sensitivity.GetValue() * default_panning_sensitivity;
-        const float y_sensitivity =
+        auto const deadzone_cw = Settings::values.mouse_panning_deadzone_counterweight.GetValue() * default_deadzone_counterweight;
-            Settings::values.mouse_panning_y_sensitivity.GetValue() * default_panning_sensitivity;
+        last_motion_change += {-mouse_change[1] * x_sensitivity, -mouse_change[0] * y_sensitivity, 0};
-        const float deadzone_counterweight =
+        last_mouse_change[0] += mouse_change[0] * x_sensitivity;
-            Settings::values.mouse_panning_deadzone_counterweight.GetValue() *
+        last_mouse_change[1] += mouse_change[1] * y_sensitivity;
-            default_deadzone_counterweight;
+        // Bind the mouse change to [0 <= deadzone_cw <= 1.0]
-
-        last_motion_change += {-mouse_change.y * x_sensitivity, -mouse_change.x * y_sensitivity, 0};
-        last_mouse_change.x += mouse_change.x * x_sensitivity;
-        last_mouse_change.y += mouse_change.y * y_sensitivity;
-
-        // Bind the mouse change to [0 <= deadzone_counterweight <= 1.0]
         const float length = last_mouse_change.Length();
-        if (length < deadzone_counterweight && length != 0.0f) {
+        if (length < deadzone_cw && length != 0.0f) {
             last_mouse_change /= length;
-            last_mouse_change *= deadzone_counterweight;
+            last_mouse_change *= deadzone_cw;
         }
-
         return;
     }
 
     if (button_pressed) {
-        const auto mouse_move = Common::MakeVec<int>(x, y) - mouse_origin;
+        const auto mouse_move = Common::Vec<int, 2>(x, y) - mouse_origin;
         const float x_sensitivity =
             Settings::values.mouse_panning_x_sensitivity.GetValue() * default_stick_sensitivity;
         const float y_sensitivity =
             Settings::values.mouse_panning_y_sensitivity.GetValue() * default_stick_sensitivity;
-        SetAxis(identifier, mouse_axis_x, static_cast<float>(mouse_move.x) * x_sensitivity);
+        SetAxis(identifier, mouse_axis_x, float(mouse_move[0]) * x_sensitivity);
-        SetAxis(identifier, mouse_axis_y, static_cast<float>(-mouse_move.y) * y_sensitivity);
+        SetAxis(identifier, mouse_axis_y, float(-mouse_move[1]) * y_sensitivity);
 
         last_motion_change = {
-            static_cast<float>(-mouse_move.y) * x_sensitivity,
+            float(-mouse_move[1]) * x_sensitivity,
-            static_cast<float>(-mouse_move.x) * y_sensitivity,
+            float(-mouse_move[0]) * y_sensitivity,
-            last_motion_change.z,
+            last_motion_change[2],
         };
     }
 }
@@ -220,18 +213,18 @@ void Mouse::ReleaseButton(MouseButton button) {
         SetAxis(identifier, mouse_axis_y, 0);
     }
 
-    last_motion_change.x = 0;
+    last_motion_change[0] = 0;
-    last_motion_change.y = 0;
+    last_motion_change[1] = 0;
 
     button_pressed = false;
 }
 
 void Mouse::MouseWheelChange(int x, int y) {
-    wheel_position.x += x;
+    wheel_position[0] += x;
-    wheel_position.y += y;
+    wheel_position[1] += y;
-    last_motion_change.z += static_cast<f32>(y);
+    last_motion_change[2] += static_cast<f32>(y);
-    SetAxis(identifier, wheel_axis_x, static_cast<f32>(wheel_position.x));
+    SetAxis(identifier, wheel_axis_x, static_cast<f32>(wheel_position[0]));
-    SetAxis(identifier, wheel_axis_y, static_cast<f32>(wheel_position.y));
+    SetAxis(identifier, wheel_axis_y, static_cast<f32>(wheel_position[1]));
 }
 
 void Mouse::ReleaseAllButtons() {

src/input_common/drivers/mouse.h

@@ -107,11 +107,11 @@ private:
 
     Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;
 
-    Common::Vec2<int> mouse_origin;
+    Common::Vec<int, 2> mouse_origin;
-    Common::Vec2<int> last_mouse_position;
+    Common::Vec<int, 2> last_mouse_position;
-    Common::Vec2<float> last_mouse_change;
+    Common::Vec<float, 2> last_mouse_change;
-    Common::Vec3<float> last_motion_change;
+    Common::Vec<float, 3> last_motion_change;
-    Common::Vec2<int> wheel_position;
+    Common::Vec<int, 2> wheel_position;
     bool button_pressed = false;
 };
 

src/yuzu/configuration/configure_input_player_widget.cpp

@@ -2936,10 +2936,10 @@ void PlayerControlPreview::DrawArrow(QPainter& p, const QPointF center, const Di
 }
 
 // Draw motion functions
-void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common::Vec3f& euler,
+void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common::Vec<f32, 3>& euler,
                                       float size) {
-    std::array<Common::Vec3f, 8> cube{
+    std::array<Common::Vec<f32, 3>, 8> cube{
-        Common::Vec3f{-0.7f, -1, -0.5f},
+        Common::Vec<f32, 3>{-0.7f, -1, -0.5f},
         {-0.7f, 1, -0.5f},
         {0.7f, 1, -0.5f},
         {0.7f, -1, -0.5f},
@@ -2949,30 +2949,38 @@ void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common:
         {0.7f, -1, 0.5f},
     };
 
-    for (Common::Vec3f& point : cube) {
+    for (Common::Vec<f32, 3>& point : cube) {
-        point.RotateFromOrigin(euler.x, euler.y, euler.z);
+        float temp = point[1];
+        point[1] = std::cos(euler[0]) * point[1] - std::sin(euler[0]) * point[2];
+        point[2] = std::sin(euler[0]) * temp + std::cos(euler[0]) * point[2];
+        temp = point[0];
+        point[0] = std::cos(euler[1]) * point[0] + std::sin(euler[1]) * point[2];
+        point[2] = -std::sin(euler[1]) * temp + std::cos(euler[1]) * point[2];
+        temp = point[0];
+        point[0] = std::cos(euler[2]) * point[0] - std::sin(euler[2]) * point[1];
+        point[1] = std::sin(euler[2]) * temp + std::cos(euler[2]) * point[1];
         point *= size;
     }
 
     const std::array<QPointF, 4> front_face{
-        center + QPointF{cube[0].x, cube[0].y},
+        center + QPointF{cube[0][0], cube[0][1]},
-        center + QPointF{cube[1].x, cube[1].y},
+        center + QPointF{cube[1][0], cube[1][1]},
-        center + QPointF{cube[2].x, cube[2].y},
+        center + QPointF{cube[2][0], cube[2][1]},
-        center + QPointF{cube[3].x, cube[3].y},
+        center + QPointF{cube[3][0], cube[3][1]},
     };
     const std::array<QPointF, 4> back_face{
-        center + QPointF{cube[4].x, cube[4].y},
+        center + QPointF{cube[4][0], cube[4][1]},
-        center + QPointF{cube[5].x, cube[5].y},
+        center + QPointF{cube[5][0], cube[5][1]},
-        center + QPointF{cube[6].x, cube[6].y},
+        center + QPointF{cube[6][0], cube[6][1]},
-        center + QPointF{cube[7].x, cube[7].y},
+        center + QPointF{cube[7][0], cube[7][1]},
     };
 
     DrawPolygon(p, front_face);
     DrawPolygon(p, back_face);
-    p.drawLine(center + QPointF{cube[0].x, cube[0].y}, center + QPointF{cube[4].x, cube[4].y});
+    p.drawLine(center + QPointF{cube[0][0], cube[0][1]}, center + QPointF{cube[4][0], cube[4][1]});
-    p.drawLine(center + QPointF{cube[1].x, cube[1].y}, center + QPointF{cube[5].x, cube[5].y});
+    p.drawLine(center + QPointF{cube[1][0], cube[1][1]}, center + QPointF{cube[5][0], cube[5][1]});
-    p.drawLine(center + QPointF{cube[2].x, cube[2].y}, center + QPointF{cube[6].x, cube[6].y});
+    p.drawLine(center + QPointF{cube[2][0], cube[2][1]}, center + QPointF{cube[6][0], cube[6][1]});
-    p.drawLine(center + QPointF{cube[3].x, cube[3].y}, center + QPointF{cube[7].x, cube[7].y});
+    p.drawLine(center + QPointF{cube[3][0], cube[3][1]}, center + QPointF{cube[7][0], cube[7][1]});
 }
 
 template <size_t N>

src/yuzu/configuration/configure_input_player_widget.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -198,7 +198,7 @@ private:
     void DrawArrow(QPainter& p, QPointF center, Direction direction, float size);
 
     // Draw motion functions
-    void Draw3dCube(QPainter& p, QPointF center, const Common::Vec3f& euler, float size);
+    void Draw3dCube(QPainter& p, QPointF center, const Common::Vec<f32, 3>& euler, float size);
 
     // Draw primitive types
     template <size_t N>