[common] remove unused vector_math.h fluff

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

.patch/unordered-dense/0001-avoid-memset-when-clearing-an-empty-table.patch

@@ -1,26 +0,0 @@
-From b3622608433c183ba868a1dc8dd9cf285eb3b916 Mon Sep 17 00:00:00 2001
-From: Dario Petrillo <dario.pk1@gmail.com>
-Date: Thu, 27 Nov 2025 23:12:38 +0100
-Subject: [PATCH] avoid extra memset when clearing an empty table
-
----
- include/ankerl/unordered_dense.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/ankerl/unordered_dense.h b/include/ankerl/unordered_dense.h
-index 0835342..4938212 100644
---- a/include/ankerl/unordered_dense.h
-+++ b/include/ankerl/unordered_dense.h
-@@ -1490,8 +1490,10 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
-     // modifiers //////////////////////////////////////////////////////////////
- 
-     void clear() {
--        m_values.clear();
--        clear_buckets();
-+        if (!empty()) {
-+            m_values.clear();
-+            clear_buckets();
-+        }
-     }
- 
-     auto insert(value_type const& value) -> std::pair<iterator, bool> {

CMakeLists.txt

@@ -23,8 +23,20 @@ include(CMakeDependentOption)
 include(CTest)
 include(CPMUtil)
 
-if (CXX_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0")
-    message(FATAL_ERROR "GCC versions older than 14.0 are not supported. Update your system, or use clang/clang++ instead.")
+if (NOT DEFINED ARCHITECTURE)
+    message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?")
+endif()
+
+# Needed for FFmpeg w/ VAAPI and DRM
+if (OPENBSD)
+    # OpenBSD 7.8 broke libcxx when upgrading, so we must define the PSTL backend manually
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R6/lib")
+elseif (NETBSD)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R7/lib")
 endif()
 
 # NetBSD: Fun for the whole family!
@@ -528,7 +540,6 @@ add_subdirectory(externals)
 # pass targets from externals
 # TODO(crueter): CPMUtil Propagate func?
 find_package(enet)
-find_package(unordered_dense REQUIRED)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
@@ -608,7 +619,7 @@ if (ENABLE_QT)
 
     # Best practice is to ask for all components at once, so they are from the same version
     set(YUZU_QT_COMPONENTS Core Widgets Charts Concurrent Gui)
-    if (NOT WIN32 AND NOT APPLE)
+    if (LINUX OR FREEBSD)
         list(APPEND YUZU_QT_COMPONENTS DBus)
         # yes Qt, we get it
         set(QT_NO_PRIVATE_MODULE_WARNING ON)

cpmfile.json

@@ -301,17 +301,6 @@
         "repo": "eden-emu/tzdb_to_nx",
         "version": "230326"
     },
-    "unordered-dense": {
-        "bundled": true,
-        "find_args": "CONFIG",
-        "hash": "d2106f6640f6bfb81755e4b8bfb64982e46ec4a507cacdb38f940123212ccf35a20b43c70c6f01d7bfb8c246d1a16f7845d8052971949cea9def1475e3fa02c8",
-        "package": "unordered_dense",
-        "patches": [
-            "0001-avoid-memset-when-clearing-an-empty-table.patch"
-        ],
-        "repo": "martinus/unordered_dense",
-        "version": "7b55cab841"
-    },
     "vulkan-headers": {
         "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
         "min_version": "1.4.317",

docs/Caveats.md

@@ -71,7 +71,7 @@ export LIBGL_ALWAYS_SOFTWARE=1
 
 Install `developer/gcc14` on OmniOS using pkgsrc.
 
-Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON` and `-DYUZU_USE_BUNDLED_OPENSSL=OFF`.
+Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON`
 
 For OmniOS you are required to build glslang yourself:
 ```sh
@@ -92,8 +92,6 @@ You may also need to install `gmake` in order to properly build FFmpeg, this is
 
 If it wasn't obvious already, you require a X11 server to properly run the emulator within OmniOS, [this guide](https://web.archive.org/web/20260424200928/https://geekblood.wordpress.com/2017/10/26/installing-x11-and-a-desktop-environment-on-omnios/) is a great starting point for that, the links to pkgsrc are outdated so follow [this exemplar](https://pkgsrc.smartos.org/install-on-illumos/) as well:
 
-For Solaris based OSes, `${CMAKE_SYSTEM_NAME}` isn't properly set on CMake (it's set to i686 on AMD64), you may find issues when building OpenSSL from `openssl-cmake`.
-
 ## HaikuOS
 
 It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation.

docs/Deps.md

@@ -80,7 +80,6 @@ Certain other dependencies will be fetched by CPM regardless. System packages *c
 * [httplib](https://github.com/yhirose/cpp-httplib) - if `ENABLE_UPDATE_CHECKER` or `ENABLE_WEB_SERVICE` are on
   * This package is known to be broken on the AUR.
 * [cpp-jwt](https://github.com/arun11299/cpp-jwt) 1.4+ - if `ENABLE_WEB_SERVICE` is on
-* [unordered-dense](https://github.com/martinus/unordered_dense)
 
 On amd64:
 
@@ -119,7 +118,7 @@ Now, install all deps:
 sudo emerge -a \
     app-arch/lz4 app-arch/zstd app-arch/unzip \
     dev-libs/libfmt dev-libs/libusb dev-libs/mcl dev-libs/sirit \
-    dev-libs/unordered_dense dev-libs/boost dev-libs/openssl dev-libs/discord-rpc \
+    dev-libs/boost dev-libs/openssl dev-libs/discord-rpc \
     dev-util/spirv-tools dev-util/spirv-headers dev-util/vulkan-headers \
     dev-util/vulkan-utility-libraries dev-util/glslang \
     media-gfx/renderdoc media-libs/libva media-libs/opus media-video/ffmpeg \
@@ -260,7 +259,7 @@ brew install molten-vk
 <details>
 <summary>FreeBSD</summary>
 
-As root run: `pkg install devel/cmake sdl3 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/qt6-charts devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib devel/unordered-dense vulkan-headers quazip-qt6`
+As root run: `pkg install devel/cmake sdl3 devel/boost-libs devel/catch2 devel/libfmt devel/nlohmann-json devel/ninja devel/nasm devel/autoconf devel/pkgconf devel/qt6-base devel/qt6-charts devel/simpleini net/enet multimedia/ffnvcodec-headers multimedia/ffmpeg audio/opus archivers/liblz4 lang/gcc12 graphics/glslang graphics/vulkan-utility-libraries graphics/spirv-tools www/cpp-httplib vulkan-headers quazip-qt6`
 
 If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 
@@ -273,7 +272,7 @@ If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 For NetBSD +10.1:
 
 ```sh
-pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6-qtbase qt6-qtcharts qt6-qtmultimedia qt6-qttools cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
+pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6 cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
 ```
 
 [Caveats](./Caveats.md#netbsd).
@@ -294,7 +293,7 @@ pkg_add cmake nasm git boost unzip--iconv autoconf-2.72p0 bash ffmpeg glslang gm
 <summary>DragonFlyBSD</summary>
 
 ```sh
-pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmake jq nlohmann-json enet spirv-tools sdl3 vulkan-utility-libraries vulkan-headers catch2 libfmt openssl liblz4 boost-libs cpp-httplib qt6-base qt6-charts quazip-qt6 unordered-dense libva-vdpau-driver libva-utils libva-intel-driver
+pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmake jq nlohmann-json enet spirv-tools sdl3 vulkan-utility-libraries vulkan-headers catch2 libfmt openssl liblz4 boost-libs cpp-httplib qt6-base qt6-charts quazip-qt6 libva-vdpau-driver libva-utils libva-intel-driver
 ```
 
 [Caveats](./Caveats.md#dragonflybsd).
@@ -328,7 +327,7 @@ sudo pkgin install git cmake autoconf build-essential libusb-1 nasm gcc13
 
 ```sh
 BASE="git make autoconf libtool automake-wrapper jq patch"
-MINGW="qt6-base qt6-charts qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus libusb unordered_dense openssl SDL3"
+MINGW="qt6-base qt6-charts qt6-tools qt6-translations qt6-svg cmake toolchain clang python-pip openssl vulkan-memory-allocator vulkan-devel glslang boost fmt lz4 nlohmann-json zlib zstd enet opus libusb openssl SDL3"
 # Either x86_64 or clang-aarch64 (Windows on ARM)
 packages="$BASE"
 for pkg in $MINGW; do

docs/dynarmic/README.md

@@ -308,32 +308,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
-### unordered_dense
-
-```
-MIT License
-
-Copyright (c) 2022 Martin Leitner-Ankerl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
 ### xbyak
 
 ```

externals/CMakeLists.txt

@@ -58,9 +58,6 @@ if (WIN32 AND NOT TARGET LLVM::Demangle)
     add_library(LLVM::Demangle ALIAS demangle)
 endif()
 
-# unordered_dense
-AddJsonPackage(unordered-dense)
-
 # httplib
 if (IOS)
     set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)

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

@@ -11,6 +11,7 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 enum class StringSetting(override val key: String) : AbstractStringSetting {
     DRIVER_PATH("driver_path"),
     DEVICE_NAME("device_name"),
+    LOG_FILTER("log_filter"),
     PROGRAM_ARGS("program_args"),
 
     WEB_TOKEN("eden_token"),

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

@@ -1033,6 +1033,13 @@ abstract class SettingsItem(
                     descriptionId = R.string.use_auto_stub_description
                 )
             )
+            put(
+                StringInputSetting(
+                    StringSetting.LOG_FILTER,
+                    titleId = R.string.log_filter,
+                    descriptionId = R.string.log_filter_description
+                )
+            )
             put(
                 SpinBoxSetting(
                     UShortSetting.DEBUG_KNOBS,

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

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

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

@@ -20,7 +20,7 @@ struct RomMetadata {
     std::vector<u8> icon;
     bool isHomebrew;
 };
-static ankerl::unordered_dense::map<std::string, RomMetadata> m_rom_metadata_cache;
+static ::Common::unordered_map<std::string, RomMetadata> m_rom_metadata_cache;
 
 static RomMetadata CacheRomMetadata(const std::string& path) {
     auto& instance = EmulationSession::GetInstance();

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

@@ -21,7 +21,7 @@
 #include "input_common/drivers/virtual_gamepad.h"
 #include "native.h"
 
-ankerl::unordered_dense::map<std::string, std::unique_ptr<AndroidConfig>> map_profiles;
+::Common::unordered_map<std::string, std::unique_ptr<AndroidConfig>> map_profiles;
 
 bool IsHandheldOnly() {
     const auto npad_style_set =

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

@@ -636,6 +636,8 @@
     <string name="log">Logging</string>
     <string name="flush_by_line">Flush debug logs by line</string>
     <string name="flush_by_line_description">Flushes debugging logs on each line written, making debugging easier in cases of crashing or freezing.</string>
+    <string name="log_filter">Log filter</string>
+    <string name="log_filter_description">Controls Eden\'s log categories. Example: *:Info Service.LM:Debug</string>
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">GPU Logging</string>

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
@@ -147,7 +146,8 @@ add_library(
     cpu_features.cpp
     cpu_features.h
     httplib.h
-    net/net.h net/net.cpp)
+    net/net.h net/net.cpp
+    container/unordered_map.h container/unordered_set.h)
 
 if(WIN32)
     target_sources(common PRIVATE windows/timer_resolution.cpp
@@ -241,7 +241,7 @@ if (lz4_ADDED)
     target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib)
 endif()
 
-target_link_libraries(common PUBLIC fmt::fmt stb::headers Threads::Threads unordered_dense::unordered_dense)
+target_link_libraries(common PUBLIC fmt::fmt stb::headers Threads::Threads)
 target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd)
 
 # Please refer to src/common/demangle.cpp

src/common/container/unordered_map.h

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include "common/container_hash.h"
+
+#include <boost/unordered/unordered_flat_map.hpp>
+
+namespace Common {
+
+template <class Key, class T, class Hash = std::hash<Key>, class Pred = std::equal_to<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+using unordered_map = boost::unordered::unordered_flat_map<Key, T, Hash, Pred, Allocator>;
+
+}

src/common/container/unordered_set.h

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include "common/container_hash.h"
+
+#include <boost/unordered/unordered_flat_set.hpp>
+
+namespace Common {
+
+template <class Key, class Hash = std::hash<Key>, class Pred = std::equal_to<Key>,
+          class Allocator = std::allocator<Key>>
+using unordered_set = boost::unordered::unordered_flat_set<Key, Hash, Pred, Allocator>;
+
+}

src/common/container_hash.h

@@ -10,8 +10,11 @@
 #include <array>
 #include <climits>
 #include <cstdint>
+#include <functional>
 #include <limits>
+#include <tuple>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace Common {
@@ -69,10 +72,17 @@ struct HashCombineImpl<64> {
 } // namespace detail
 
 template <typename T>
+    requires std::is_unsigned_v<T>
 inline void HashCombine(std::size_t& seed, const T& v) {
     seed = detail::HashCombineImpl<sizeof(std::size_t) * CHAR_BIT>::fn(seed, detail::HashValue(v));
 }
 
+template <typename T>
+    requires (!std::is_unsigned_v<T>)
+inline void HashCombine(std::size_t& seed, const T& v) {
+    seed = detail::HashCombineImpl<sizeof(std::size_t) * CHAR_BIT>::fn(seed, std::hash<T>{}(v));
+}
+
 template <typename It>
 inline std::size_t HashRange(It first, It last) {
     std::size_t seed = 0;
@@ -95,3 +105,26 @@ std::size_t HashValue(const std::vector<T, Allocator>& v) {
 }
 
 } // namespace Common
+
+namespace std {
+
+template <typename... Args>
+struct hash<std::tuple<Args...>> {
+    std::size_t operator()(const std::tuple<Args...>& t) const noexcept {
+        std::size_t seed = 0;
+        std::apply([&seed](const Args&... args) { (Common::HashCombine(seed, args), ...); }, t);
+        return seed;
+    }
+};
+
+template <class A, class B>
+struct hash<std::pair<A, B>> {
+    std::size_t operator()(const std::pair<A, B>& p) const noexcept {
+        std::size_t seed = 0;
+        Common::HashCombine(seed, p.first);
+        Common::HashCombine(seed, p.second);
+        return seed;
+    }
+};
+
+} // namespace std

src/common/fs/path_util.cpp

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <iostream>
 #include <sstream>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/assert.h"
 #include "common/fs/fs.h"
@@ -196,8 +196,8 @@ private:
         SetLegacyPathImpl(legacy_path, new_path);
     }
 
-    ankerl::unordered_dense::map<EdenPath, fs::path> eden_paths;
-    ankerl::unordered_dense::map<EmuPath, fs::path> legacy_paths;
+    ::Common::unordered_map<EdenPath, fs::path> eden_paths;
+    ::Common::unordered_map<EmuPath, fs::path> legacy_paths;
 };
 
 bool ValidatePath(const fs::path& path) {

src/common/host_memory.cpp

@@ -7,7 +7,7 @@
 #ifdef _WIN32
 
 #include <iterator>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <boost/icl/separate_interval_set.hpp>
 #include <windows.h>
 #include "common/dynamic_library.h"
@@ -391,7 +391,7 @@ private:
 
     std::mutex placeholder_mutex;                                 ///< Mutex for placeholders
     boost::icl::separate_interval_set<size_t> placeholders;       ///< Mapped placeholders
-    ankerl::unordered_dense::map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset
+    ::Common::unordered_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset
 };
 
 #elif defined(__OPENORBIS__) || defined(__managarm__)

src/common/input.h

@@ -9,7 +9,7 @@
 #include <functional>
 #include <memory>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <utility>
 #include <vector>
 #include "common/logging.h"
@@ -412,7 +412,7 @@ public:
 namespace Impl {
 
 template <typename InputDeviceType>
-using FactoryListType = ankerl::unordered_dense::map<std::string, std::shared_ptr<Factory<InputDeviceType>>>;
+using FactoryListType = ::Common::unordered_map<std::string, std::shared_ptr<Factory<InputDeviceType>>>;
 
 template <typename InputDeviceType>
 struct FactoryList {

src/common/param_package.h

@@ -8,14 +8,14 @@
 
 #include <initializer_list>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 namespace Common {
 
 /// A string-based key-value container supporting serializing to and deserializing from a string
 class ParamPackage {
 public:
-    using DataType = ankerl::unordered_dense::map<std::string, std::string>;
+    using DataType = ::Common::unordered_map<std::string, std::string>;
 
     ParamPackage() = default;
     explicit ParamPackage(const std::string& serialized);

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/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
@@ -21,7 +21,7 @@ class Vec2;
 template <typename T>
 class Vec3;
 template <typename T>
-class Vec4;
+class Quaternion;
 
 template <typename T>
 class Vec2 {
@@ -30,141 +30,82 @@ public:
     T y{};
 
     constexpr Vec2() = default;
-    constexpr Vec2(const T& x_, const T& y_) : x(x_), y(y_) {}
+    constexpr Vec2(const T& x_, const T& y_) noexcept : x(x_), y(y_) {}
 
-    template <typename T2>
-    [[nodiscard]] constexpr Vec2<T2> Cast() const {
-        return Vec2<T2>(static_cast<T2>(x), static_cast<T2>(y));
-    }
-
-    [[nodiscard]] static constexpr Vec2 AssignToAll(const T& f) {
-        return Vec2{f, f};
-    }
-
-    [[nodiscard]] constexpr Vec2<decltype(T{} + T{})> operator+(const Vec2& other) const {
+    [[nodiscard]] constexpr Vec2<decltype(T{} + T{})> operator+(const Vec2& other) const noexcept {
         return {x + other.x, y + other.y};
     }
-    constexpr Vec2& operator+=(const Vec2& other) {
+    constexpr Vec2& operator+=(const Vec2& other) noexcept {
         x += other.x;
         y += other.y;
         return *this;
     }
-    [[nodiscard]] constexpr Vec2<decltype(T{} - T{})> operator-(const Vec2& other) const {
+    [[nodiscard]] constexpr Vec2<decltype(T{} - T{})> operator-(const Vec2& other) const noexcept {
         return {x - other.x, y - other.y};
     }
-    constexpr Vec2& operator-=(const Vec2& other) {
+    constexpr Vec2& operator-=(const Vec2& other) noexcept {
         x -= other.x;
         y -= other.y;
         return *this;
     }
 
     template <typename U = T>
-    [[nodiscard]] constexpr Vec2<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const {
+    [[nodiscard]] constexpr Vec2<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const noexcept {
         return {-x, -y};
     }
-    [[nodiscard]] constexpr Vec2<decltype(T{} * T{})> operator*(const Vec2& other) const {
+    [[nodiscard]] constexpr Vec2<decltype(T{} * T{})> operator*(const Vec2& other) const noexcept {
         return {x * other.x, y * other.y};
     }
 
     template <typename V>
-    [[nodiscard]] constexpr Vec2<decltype(T{} * V{})> operator*(const V& f) const {
+    [[nodiscard]] constexpr Vec2<decltype(T{} * V{})> operator*(const V& f) const noexcept {
         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)),
+            TV(C(x) * C(f)),
+            TV(C(y) * C(f)),
         };
     }
 
     template <typename V>
-    constexpr Vec2& operator*=(const V& f) {
-        *this = *this * f;
-        return *this;
+    constexpr Vec2& operator*=(const V& f) noexcept {
+        return *this = *this * f;
     }
 
     template <typename V>
-    [[nodiscard]] constexpr Vec2<decltype(T{} / V{})> operator/(const V& f) const {
+    [[nodiscard]] constexpr Vec2<decltype(T{} / V{})> operator/(const V& f) const noexcept {
         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)),
+            TV(C(x) / C(f)),
+            TV(C(y) / C(f)),
         };
     }
 
     template <typename V>
-    constexpr Vec2& operator/=(const V& f) {
-        *this = *this / f;
-        return *this;
+    constexpr Vec2& operator/=(const V& f) noexcept {
+        return *this = *this / f;
     }
 
-    [[nodiscard]] constexpr T Length2() const {
+    [[nodiscard]] constexpr T Length2() const noexcept {
         return x * x + y * y;
     }
 
     // Only implemented for T=float
     [[nodiscard]] float Length() const;
-    [[nodiscard]] float Normalize(); // returns the previous length, which is often useful
 
-    [[nodiscard]] constexpr T& operator[](std::size_t i) {
+    [[nodiscard]] constexpr T& operator[](std::size_t i) noexcept {
         return *((&x) + i);
     }
-    [[nodiscard]] constexpr const T& operator[](std::size_t i) const {
+    [[nodiscard]] constexpr const T& operator[](std::size_t i) const noexcept {
         return *((&x) + i);
     }
-
-    constexpr void SetZero() {
-        x = 0;
-        y = 0;
-    }
-
-    // Common aliases: UV (texel coordinates), ST (texture coordinates)
-    [[nodiscard]] constexpr T& u() {
-        return x;
-    }
-    [[nodiscard]] constexpr T& v() {
-        return y;
-    }
-    [[nodiscard]] constexpr T& s() {
-        return x;
-    }
-    [[nodiscard]] constexpr T& t() {
-        return y;
-    }
-
-    [[nodiscard]] constexpr const T& u() const {
-        return x;
-    }
-    [[nodiscard]] constexpr const T& v() const {
-        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>
-[[nodiscard]] constexpr Vec2<T> operator*(const V& f, const Vec2<T>& vec) {
+[[nodiscard]] constexpr Vec2<T> operator*(const V& f, const Vec2<T>& vec) noexcept {
     using C = std::common_type_t<T, V>;
-
-    return Vec2<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)));
+    return Vec2<T>(T(C(f) * C(vec.x)), T(C(f) * C(vec.y)));
 }
 
 using Vec2f = Vec2<float>;
@@ -174,13 +115,6 @@ 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:
@@ -189,33 +123,24 @@ public:
     T z{};
 
     constexpr Vec3() = default;
-    constexpr Vec3(const T& x_, const T& y_, const T& z_) : x(x_), y(y_), z(z_) {}
+    constexpr Vec3(const T& x_, const T& y_, const T& z_) noexcept : 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 {
+    [[nodiscard]] constexpr Vec3<decltype(T{} + T{})> operator+(const Vec3& other) const noexcept {
         return {x + other.x, y + other.y, z + other.z};
     }
 
-    constexpr Vec3& operator+=(const Vec3& other) {
+    constexpr Vec3 operator+=(const Vec3& other) noexcept {
         x += other.x;
         y += other.y;
         z += other.z;
         return *this;
     }
 
-    [[nodiscard]] constexpr Vec3<decltype(T{} - T{})> operator-(const Vec3& other) const {
+    [[nodiscard]] constexpr Vec3<decltype(T{} - T{})> operator-(const Vec3& other) const noexcept {
         return {x - other.x, y - other.y, z - other.z};
     }
 
-    constexpr Vec3& operator-=(const Vec3& other) {
+    constexpr Vec3 operator-=(const Vec3& other) noexcept {
         x -= other.x;
         y -= other.y;
         z -= other.z;
@@ -223,177 +148,68 @@ public:
     }
 
     template <typename U = T>
-    [[nodiscard]] constexpr Vec3<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const {
+    [[nodiscard]] constexpr Vec3<std::enable_if_t<std::is_signed_v<U>, U>> operator-() const noexcept {
         return {-x, -y, -z};
     }
 
-    [[nodiscard]] constexpr Vec3<decltype(T{} * T{})> operator*(const Vec3& other) const {
+    [[nodiscard]] constexpr Vec3<decltype(T{} * T{})> operator*(const Vec3& other) const noexcept {
         return {x * other.x, y * other.y, z * other.z};
     }
 
     template <typename V>
-    [[nodiscard]] constexpr Vec3<decltype(T{} * V{})> operator*(const V& f) const {
+    [[nodiscard]] constexpr Vec3<decltype(T{} * V{})> operator*(const V& f) const noexcept {
         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)),
+            TV(C(x) * C(f)),
+            TV(C(y) * C(f)),
+            TV(C(z) * C(f)),
         };
     }
 
     template <typename V>
-    constexpr Vec3& operator*=(const V& f) {
-        *this = *this * f;
-        return *this;
+    constexpr Vec3 operator*=(const V& f) noexcept {
+        return *this = *this * f;
     }
     template <typename V>
-    [[nodiscard]] constexpr Vec3<decltype(T{} / V{})> operator/(const V& f) const {
+    [[nodiscard]] constexpr Vec3<decltype(T{} / V{})> operator/(const V& f) const noexcept {
         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)),
+            TV(C(x) / C(f)),
+            TV(C(y) / C(f)),
+            TV(C(z) / C(f)),
         };
     }
 
     template <typename V>
-    constexpr Vec3& operator/=(const V& f) {
-        *this = *this / f;
-        return *this;
+    constexpr Vec3& operator/=(const V& f) noexcept {
+        return *this = *this / f;
     }
 
-    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 {
+    [[nodiscard]] constexpr T Length2() const noexcept {
         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) {
+    [[nodiscard]] constexpr T& operator[](std::size_t i) noexcept {
         return *((&x) + i);
     }
 
-    [[nodiscard]] constexpr const T& operator[](std::size_t i) const {
+    [[nodiscard]] constexpr const T& operator[](std::size_t i) const noexcept {
         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) {
+[[nodiscard]] constexpr Vec3<T> operator*(const V& f, const Vec3<T>& vec) noexcept {
     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)));
+    return Vec3<T>(T(C(f) * C(vec.x)), T(C(f) * C(vec.y)), T(C(f) * C(vec.z)));
 }
 
 template <>
@@ -406,353 +222,62 @@ 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 {
+class Quaternion {
 public:
-    T x{};
-    T y{};
-    T z{};
+    Vec3<T> xyz;
     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]] Quaternion<decltype(T{} + T{})> operator+(const Quaternion& other) const noexcept {
+        return {xyz + other.xyz, w + other.w};
     }
 
-    [[nodiscard]] static constexpr Vec4 AssignToAll(const T& f) {
-        return Vec4(f, f, f, f);
+    [[nodiscard]] Quaternion<decltype(T{} - T{})> operator-(const Quaternion& other) const noexcept {
+        return {xyz - other.xyz, w - other.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};
+    [[nodiscard]] Quaternion<decltype(T{} * T{} - T{} * T{})> operator*(const Quaternion& other) const noexcept {
+        return {xyz * other.w + other.xyz * w + Cross(xyz, other.xyz), w * other.w - Dot(xyz, other.xyz)};
     }
 
-    constexpr Vec4& operator+=(const Vec4& other) {
-        x += other.x;
-        y += other.y;
-        z += other.z;
-        w += other.w;
-        return *this;
+    [[nodiscard]] Quaternion<T> Normalized() const noexcept {
+        T length = std::sqrt(xyz.Length2() + w * w);
+        return {xyz / length, w / length};
     }
 
-    [[nodiscard]] constexpr Vec4<decltype(T{} - T{})> operator-(const Vec4& other) const {
-        return {x - other.x, y - other.y, z - other.z, w - other.w};
-    }
+    [[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];
 
-    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>;
+        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 {
-            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)),
+            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 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/common/x64/xbyak.h

@@ -22,10 +22,11 @@
 #endif
 
 // You must ensure this matches with src/common/x64/xbyak.h on root dir
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 #include <boost/unordered_map.hpp>
-#define XBYAK_STD_UNORDERED_SET ankerl::unordered_dense::set
-#define XBYAK_STD_UNORDERED_MAP ankerl::unordered_dense::map
+#define XBYAK_STD_UNORDERED_SET ::Common::unordered_set
+#define XBYAK_STD_UNORDERED_MAP ::Common::unordered_map
 #define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap
 #include <xbyak/xbyak.h>
 #include <xbyak/xbyak_util.h>

src/core/arm/dynarmic/arm_dynarmic_64.h

@@ -8,7 +8,7 @@
 
 #include <atomic>
 #include <memory>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include <dynarmic/interface/A64/a64.h>
 #include <dynarmic/interface/code_page.h>

src/core/arm/nce/patcher.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <span>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 #include <oaknut/code_block.hpp>
 #include <oaknut/oaknut.hpp>
@@ -46,7 +46,7 @@ enum class PatchMode : u32 {
 
 using ModuleTextAddress = u64;
 using PatchTextAddress = u64;
-using EntryTrampolines = ankerl::unordered_dense::map<ModuleTextAddress, PatchTextAddress>;
+using EntryTrampolines = ::Common::unordered_map<ModuleTextAddress, PatchTextAddress>;
 
 class Patcher {
 public:

src/core/file_sys/ips_layer.cpp

@@ -8,7 +8,7 @@
 #include <utility>
 #include <span>
 #include <cctype>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/hex_util.h"
 #include "common/logging.h"
@@ -104,7 +104,7 @@ struct IPSwitchRecord {
     size_t count;
 };
 struct IPSwitchCompiler::IPSwitchPatch {
-    ankerl::unordered_dense::map<u32, IPSwitchRecord> records;
+    ::Common::unordered_map<u32, IPSwitchRecord> records;
     bool enabled;
 };
 
@@ -123,11 +123,13 @@ static IPSwitchRecord EscapeStringSequences(std::string_view sv) {
     for (auto it = sv.cbegin(); it != sv.cend(); ) {
         if (*it == '\\' && it + 1 < sv.cend()) {
             switch (it[1]) {
-            case 'n': r.data[r.count] = '\n'; break;
-            case 't': r.data[r.count] = '\t'; break;
+            case 'a': r.data[r.count] = '\a'; break;
             case 'b': r.data[r.count] = '\b'; break;
-            case 'r': r.data[r.count] = '\r'; break;
             case 'e': r.data[r.count] = '\e'; break;
+            case 'f': r.data[r.count] = '\f'; break;
+            case 'n': r.data[r.count] = '\n'; break;
+            case 'r': r.data[r.count] = '\r'; break;
+            case 't': r.data[r.count] = '\t'; break;
             case 'v': r.data[r.count] = '\v'; break;
             case '?': r.data[r.count] = '\?'; break;
             default: r.data[r.count] = it[1]; break;
@@ -142,40 +144,60 @@ static IPSwitchRecord EscapeStringSequences(std::string_view sv) {
     return r;
 }
 
-[[nodiscard]] static inline std::array<u8, 32> ReadNSOBuildId(std::string_view const s) {
-    std::array<u8, 32> r{};
-    for (std::size_t i = 0; i < s.size(); ++i)
-        r[i / 2] |= u8(u8(Common::ToHexNibble(s[i])) << u8((i % 2) * 4));
-    return r;
-}
-
 void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
     LOG_INFO(Loader, "IPSwitchCompiler: '{}'", patch_text->GetName());
-    bool is_little_endian = false;
+    bool is_little_endian = true;
     s64 offset_shift = 0;
     //bool print_values = false;
-
     auto const parse_line = [&](std::string_view const line) {
         // Keep in mind lines have trimmed spaces (at the end & start)!
         LOG_INFO(Loader, "<{}>", line);
-        if (line.starts_with("@stop")) {
-            return false; // Force stop
-        } else if (line.starts_with("@nsobid-")) { // NSO Build ID Specifier
-            nso_build_id = ReadNSOBuildId(line.substr(8));
-        } else if (line.starts_with("@enabled")) {
-            patches.push_back({{}, true}); //enabled patch
-        } else if (line.starts_with("@disabled")) {
-            patches.push_back({{}, false}); //disabled patch
-        } else if (line.starts_with("@flag offset_shift ")) {
-            offset_shift = std::strtoll(line.data() + 19, nullptr, 0);  // Offset Shift Flag
-        } else if (line.starts_with("@little-endian")) {
-            is_little_endian = true;  // Set values to read as little endian
-        } else if (line.starts_with("@big-endian")) {
-            is_little_endian = false;  // Set values to read as big endian
-        } else if (line.starts_with("@flag print_values")) {
-            //print_values = true; // Force printing of applied values
-        } else if (line.starts_with("@")) {
-            LOG_WARNING(Loader, "Unknown flag {}", line);
+        // IPSwitch is case insensitive
+        // Yes this is how the logic goes for the main reference parsers!
+        if (line.size() > 2 && line[0] == '@') {
+            switch (line[1]) {
+            // yes, @nsobid too -- NSO Build ID Specifier
+            case 'n':
+            case 'N':
+                nso_build_id = Common::HexStringToArray<0x20>(fmt::format("{:0<64}", line.substr(8)));
+                break;
+            // @stop
+            case 's':
+            case 'S':
+                return false;
+            // @enabled
+            case 'e':
+            case 'E':
+                patches.push_back({{}, true});
+                break;
+            // @disabled
+            case 'd':
+            case 'D':
+                patches.push_back({{}, false});
+                break;
+            // @flag
+            case 'f':
+            case 'F': {
+                if (line.starts_with("@flag offset_shift")) {
+                    offset_shift = std::strtoll(line.data() + 19, nullptr, 0);  // Offset Shift Flag
+                } else if (line.starts_with("@flag print_values")) {
+                    //print_values = true; // Force printing of applied values
+                }
+                break;
+            }
+            case 'l':
+            case 'L':
+                is_little_endian = true;
+                break;
+            // IPS parsers dont support big endian no more, we do due to backcompat
+            case 'b':
+            case 'B':
+                is_little_endian = false;
+                break;
+            default:
+                LOG_WARNING(Loader, "Unknown flag {}", line);
+                break;
+            }
         } else {
             size_t offset = size_t(std::strtoul(line.data(), nullptr, 16));
             offset += size_t(offset_shift);
@@ -197,6 +219,7 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
                 auto const start = line.cbegin() + first_space + 1;
                 auto const end = line.cend();
                 if (start <= line.cend() && end <= line.cend()) {
+                    // Actually IPS wants ordering from {lsb, ..., msb} -- so LE and BE are inverted, fun!
                     auto const hs = Common::HexStringToVector({start, end}, is_little_endian);
                     std::memcpy(r.data.data(), hs.data(), hs.size());
                     r.count = hs.size();
@@ -231,7 +254,8 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
             char quote = '\0';
             auto const sline_start = p;
             for (; p < sline.cend(); ) {
-                if ((!quote && p + 1 < sline.cend() && p[0] == '/' && p[1] == '/')
+                // we dont check for "//", IPS checks for '/' only...
+                if ((!quote && p[0] == '/')
                 || (!quote && p[0] == '#')) {
                     break;
                 } else if (p[0] == '\"' || p[0] == '\'') {
@@ -266,6 +290,8 @@ VirtualFile IPSwitchCompiler::Apply(const VirtualFile& in) const {
                     if (record.first + replace_size > in_data.size())
                         replace_size = in_data.size() - record.first;
                     std::memcpy(in_data.data() + record.first, record.second.data.data(), replace_size);
+                } else {
+                    LOG_WARNING(Loader, "record offs={:x},size={:x}", record.first, record.second.data.size());
                 }
             }
         }

src/core/file_sys/registered_cache.cpp

@@ -566,7 +566,7 @@ VirtualFile RegisteredCache::GetFileAtID(NcaID id) const {
     return file;
 }
 
-static std::optional<NcaID> CheckMapForContentRecord(const ankerl::unordered_dense::map<u64, CNMT>& map, u64 title_id, ContentRecordType type) {
+static std::optional<NcaID> CheckMapForContentRecord(const ::Common::unordered_map<u64, CNMT>& map, u64 title_id, ContentRecordType type) {
     auto cmnt_iter = map.find(title_id);
     u8 id_offset = 0;
 

src/core/file_sys/registered_cache.h

@@ -12,7 +12,7 @@
 #include <optional>
 #include <string>
 #include <vector>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <boost/container/flat_map.hpp>
 #include "common/common_types.h"
 #include "core/crypto/key_manager.h"
@@ -209,11 +209,11 @@ private:
     ContentProviderParsingFunction parser;
 
     // maps tid -> NcaID of meta
-    ankerl::unordered_dense::map<u64, NcaID> meta_id;
+    ::Common::unordered_map<u64, NcaID> meta_id;
     // maps tid -> meta
-    ankerl::unordered_dense::map<u64, CNMT> meta;
+    ::Common::unordered_map<u64, CNMT> meta;
     // maps tid -> meta for CNMT in yuzu_meta
-    ankerl::unordered_dense::map<u64, CNMT> yuzu_meta;
+    ::Common::unordered_map<u64, CNMT> yuzu_meta;
 };
 
 enum class ContentProviderUnionSlot {
@@ -313,8 +313,8 @@ private:
     void ProcessXCI(const VirtualFile& file);
 
     std::vector<VirtualDir> load_dirs;
-    ankerl::unordered_dense::map<std::tuple<u64, ContentRecordType, TitleType>, VirtualFile> entries;
-    ankerl::unordered_dense::map<u64, u32> versions;
+    ::Common::unordered_map<std::tuple<u64, ContentRecordType, TitleType>, VirtualFile> entries;
+    ::Common::unordered_map<u64, u32> versions;
     std::vector<ExternalUpdateEntry> multi_version_entries;
 };
 

src/core/file_sys/vfs/vfs_layered.cpp

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 #include <set>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_set.h"
 #include <utility>
 #include "core/file_sys/vfs/vfs_layered.h"
 
@@ -63,7 +63,7 @@ std::string LayeredVfsDirectory::GetFullPath() const {
 
 std::vector<VirtualFile> LayeredVfsDirectory::GetFiles() const {
     std::vector<VirtualFile> out;
-    ankerl::unordered_dense::set<std::string> out_names;
+    ::Common::unordered_set<std::string> out_names;
 
     for (const auto& layer : dirs) {
         for (auto& file : layer->GetFiles()) {
@@ -79,7 +79,7 @@ std::vector<VirtualFile> LayeredVfsDirectory::GetFiles() const {
 
 std::vector<VirtualDir> LayeredVfsDirectory::GetSubdirectories() const {
     std::vector<VirtualDir> out;
-    ankerl::unordered_dense::set<std::string> out_names;
+    ::Common::unordered_set<std::string> out_names;
 
     for (const auto& layer : dirs) {
         for (const auto& sd : layer->GetSubdirectories()) {

src/core/hle/kernel/k_process.h

@@ -78,7 +78,7 @@ private:
     std::array<DebugWatchpoint, Core::Hardware::NUM_WATCHPOINTS> m_watchpoints{};
     std::map<KProcessAddress, u64> m_debug_page_refcounts{};
 #ifdef HAS_NCE
-    ankerl::unordered_dense::map<u64, u64> m_post_handlers{};
+    ::Common::unordered_map<u64, u64> m_post_handlers{};
 #endif
     std::unique_ptr<Core::ExclusiveMonitor> m_exclusive_monitor;
     Core::Memory::Memory m_memory;
@@ -494,7 +494,7 @@ public:
     static void Switch(KernelCore& kernel, KProcess* cur_process, KProcess* next_process);
 
 #ifdef HAS_NCE
-    ankerl::unordered_dense::map<u64, u64>& GetPostHandlers() noexcept {
+    ::Common::unordered_map<u64, u64>& GetPostHandlers() noexcept {
         return m_post_handlers;
     }
 #endif

src/core/hle/kernel/kernel.cpp

@@ -10,7 +10,8 @@
 #include <functional>
 #include <memory>
 #include <thread>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 #include <utility>
 
 #include "common/assert.h"
@@ -792,8 +793,8 @@ struct KernelCore::Impl {
 
     std::optional<KObjectNameGlobalData> object_name_global_data;
 
-    ankerl::unordered_dense::set<KAutoObject*> registered_objects;
-    ankerl::unordered_dense::set<KAutoObject*> registered_in_use_objects;
+    ::Common::unordered_set<KAutoObject*> registered_objects;
+    ::Common::unordered_set<KAutoObject*> registered_in_use_objects;
 
     std::mutex server_lock;
     std::vector<std::unique_ptr<Service::ServerManager>> server_managers;

src/core/hle/kernel/kernel.h

@@ -11,7 +11,7 @@
 #include <list>
 #include <memory>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include "common/polyfill_thread.h"

src/core/hle/service/am/frontend/applet_web_browser_types.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <array>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include "common/common_funcs.h"
@@ -176,6 +176,6 @@ struct WebCommonReturnValue {
 };
 static_assert(sizeof(WebCommonReturnValue) == 0x1010, "WebCommonReturnValue has incorrect size.");
 
-using WebArgInputTLVMap = ankerl::unordered_dense::map<WebArgInputTLVType, std::vector<u8>>;
+using WebArgInputTLVMap = ::Common::unordered_map<WebArgInputTLVType, std::vector<u8>>;
 
 } // namespace Service::AM::Frontend

src/core/hle/service/bcat/news/builtin_news.cpp

@@ -40,8 +40,8 @@ std::vector<u8> default_logo_small;
 std::vector<u8> default_logo_large;
 bool default_logos_loaded = false;
 
-ankerl::unordered_dense::map<std::string, std::vector<u8>> news_images_small;
-ankerl::unordered_dense::map<std::string, std::vector<u8>> news_images_large;
+::Common::unordered_map<std::string, std::vector<u8>> news_images_small;
+::Common::unordered_map<std::string, std::vector<u8>> news_images_large;
 std::mutex images_mutex;
 
 

src/core/hle/service/bcat/news/news_storage.h

@@ -12,7 +12,7 @@
 #include <optional>
 #include <span>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include "common/common_types.h"
@@ -93,7 +93,7 @@ private:
     static s64 Now();
 
     mutable std::mutex mtx;
-    ankerl::unordered_dense::map<std::string, StoredNews> items;
+    ::Common::unordered_map<std::string, StoredNews> items;
     size_t open_counter{};
 };
 

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

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/fs/fs.h"
 #include "core/hle/result.h"
@@ -88,7 +88,7 @@ private:
     AlbumFileDateTime ConvertToAlbumDateTime(u64 posix_time) const;
 
     bool is_mounted{};
-    ankerl::unordered_dense::map<AlbumFileId, std::filesystem::path> album_files;
+    ::Common::unordered_map<AlbumFileId, std::filesystem::path> album_files;
 
     Core::System& system;
 };

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

@@ -15,7 +15,7 @@
 #include <random>
 #include <span>
 #include <thread>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/logging.h"
 #include "common/socket_types.h"
@@ -119,7 +119,7 @@ protected:
     std::array<LanStation, StationCountMax> stations;
     std::array<NodeLatestUpdate, NodeCountMax> node_changes{};
     std::array<u8, NodeCountMax> node_last_states{};
-    ankerl::unordered_dense::map<MacAddress, NetworkInfo, MACAddressHash> scan_results{};
+    ::Common::unordered_map<MacAddress, NetworkInfo, MACAddressHash> scan_results{};
     NodeInfo node_info{};
     NetworkInfo network_info{};
     State state{State::None};

src/core/hle/service/lm/lm.cpp

@@ -7,7 +7,7 @@
 #include <string>
 
 #include <optional>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <boost/container_hash/hash.hpp>
 #include "common/logging.h"
 #include "core/core.h"
@@ -331,7 +331,7 @@ private:
     };
     static_assert(sizeof(LogPacketHeader) == 0x18, "LogPacketHeader is an invalid size");
 
-    ankerl::unordered_dense::map<LogPacketHeaderEntry, std::vector<u8>> entries{};
+    ::Common::unordered_map<LogPacketHeaderEntry, std::vector<u8>> entries{};
     LogDestination destination{LogDestination::All};
 };
 

src/core/hle/service/nifm/nifm.cpp

@@ -23,7 +23,7 @@
 #include <mutex>
 #include <optional>
 #include <thread>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <common/settings.h>
 
 #ifdef _WIN32

src/core/hle/service/nvdrv/core/container.h

@@ -9,7 +9,7 @@
 
 #include <deque>
 #include <memory>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "core/device_memory_manager.h"
 #include "core/hle/service/nvdrv/nvdata.h"

src/core/hle/service/nvdrv/core/nvmap.h

@@ -12,7 +12,7 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <assert.h>
 
 #include "common/bit_field.h"
@@ -161,7 +161,7 @@ private:
     std::list<std::shared_ptr<Handle>> unmap_queue{};
     std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue`
 
-    ankerl::unordered_dense::map<Handle::Id, std::shared_ptr<Handle>>
+    ::Common::unordered_map<Handle::Id, std::shared_ptr<Handle>>
         handles{};           //!< Main owning map of handles
     std::mutex handles_lock; //!< Protects access to `handles`
 

src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h

@@ -13,7 +13,7 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_set.h"
 #include <vector>
 
 #include "common/address_space.h"
@@ -113,7 +113,7 @@ private:
     };
     static_assert(sizeof(IoctlRemapEntry) == 20, "IoctlRemapEntry is incorrect size");
 
-    ankerl::unordered_dense::set<s64_le> map_buffer_offsets{};
+    ::Common::unordered_set<s64_le> map_buffer_offsets{};
 
     struct IoctlMapBufferEx {
         MappingFlags flags{}; // bit0: fixed_offset, bit2: cacheable

src/core/hle/service/nvdrv/devices/nvhost_gpu.h

@@ -217,7 +217,7 @@ private:
     NvCore::SyncpointManager& syncpoint_manager;
     NvCore::NvMap& nvmap;
     std::shared_ptr<Tegra::Control::ChannelState> channel_state;
-    ankerl::unordered_dense::map<DeviceFD, NvCore::SessionId> sessions;
+    ::Common::unordered_map<DeviceFD, NvCore::SessionId> sessions;
     u32 channel_syncpoint;
     std::mutex channel_mutex;
 

src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <deque>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include "common/common_types.h"
@@ -138,7 +138,7 @@ protected:
     NvCore::NvMap& nvmap;
     NvCore::ChannelType channel_type;
     std::array<u32, MaxSyncPoints> device_syncpoints{};
-    ankerl::unordered_dense::map<DeviceFD, NvCore::SessionId> sessions;
+    ::Common::unordered_map<DeviceFD, NvCore::SessionId> sessions;
 };
 }; // namespace Devices
 } // namespace Service::Nvidia

src/core/hle/service/nvdrv/devices/nvmap.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <memory>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -118,7 +118,7 @@ private:
 
     NvCore::Container& container;
     NvCore::NvMap& file;
-    ankerl::unordered_dense::map<DeviceFD, NvCore::SessionId> sessions;
+    ::Common::unordered_map<DeviceFD, NvCore::SessionId> sessions;
 };
 
 } // namespace Service::Nvidia::Devices

src/core/hle/service/nvdrv/nvdrv.h

@@ -12,7 +12,7 @@
 #include <memory>
 #include <span>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_types.h"
 #include "core/hle/service/kernel_helpers.h"
@@ -103,7 +103,7 @@ private:
     /// Id to use for the next open file descriptor.
     DeviceFD next_fd = 1;
 
-    using FilesContainerType = ankerl::unordered_dense::map<DeviceFD, std::shared_ptr<Devices::nvdevice>>;
+    using FilesContainerType = ::Common::unordered_map<DeviceFD, std::shared_ptr<Devices::nvdevice>>;
     /// Mapping of file descriptors to the devices they reference.
     FilesContainerType open_files;
 
@@ -111,7 +111,7 @@ private:
 
     EventInterface events_interface;
 
-    ankerl::unordered_dense::map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
+    ::Common::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
 };
 
 void LoopProcess(Core::System& system);

src/core/hle/service/nvnflinger/hos_binder_driver_server.h

@@ -8,7 +8,7 @@
 
 #include <memory>
 #include <mutex>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_types.h"
 #include "core/hle/service/nvnflinger/binder.h"
@@ -39,8 +39,8 @@ private:
 
     mutable std::mutex lock;
     s32 last_id = 0;
-    ankerl::unordered_dense::map<s32, std::shared_ptr<android::IBinder>> binders;
-    ankerl::unordered_dense::map<s32, RefCounts> refcounts;
+    ::Common::unordered_map<s32, std::shared_ptr<android::IBinder>> binders;
+    ::Common::unordered_map<s32, RefCounts> refcounts;
 };
 
 } // namespace Service::Nvnflinger

src/core/hle/service/olsc/daemon_controller.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/uuid.h"
 #include "core/hle/service/cmif_types.h"
@@ -56,10 +56,10 @@ private:
         }
     };
 
-    ankerl::unordered_dense::map<AppKey, bool, AppKeyHash> app_auto_transfer_{};
-    ankerl::unordered_dense::map<Common::UUID, bool> global_auto_upload_{};
-    ankerl::unordered_dense::map<Common::UUID, bool> global_auto_download_{};
-    ankerl::unordered_dense::map<AppKey, u8, AppKeyHash> autonomy_task_status_{};
+    ::Common::unordered_map<AppKey, bool, AppKeyHash> app_auto_transfer_{};
+    ::Common::unordered_map<Common::UUID, bool> global_auto_upload_{};
+    ::Common::unordered_map<Common::UUID, bool> global_auto_download_{};
+    ::Common::unordered_map<AppKey, u8, AppKeyHash> autonomy_task_status_{};
 };
 
 } // namespace Service::OLSC

src/core/hle/service/service.h

@@ -8,7 +8,7 @@
 
 #include <cstddef>
 #include <mutex>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include "common/common_types.h"
 #include "core/hle/service/hle_ipc.h"
 
@@ -99,8 +99,8 @@ private:
     void ReportUnimplementedFunction(HLERequestContext& ctx, const FunctionInfoBase* info);
 
 protected:
-    ankerl::unordered_dense::map<u32, FunctionInfoBase> handlers;
-    ankerl::unordered_dense::map<u32, FunctionInfoBase> handlers_tipc;
+    ::Common::unordered_map<u32, FunctionInfoBase> handlers;
+    ::Common::unordered_map<u32, FunctionInfoBase> handlers_tipc;
     /// Used to gain exclusive access to the service members, e.g. from CoreTiming thread.
     std::mutex lock_service;
     /// System context that the service operates under.

src/core/hle/service/sm/sm.h

@@ -10,7 +10,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <concepts>
 
 #include "core/hle/kernel/k_port.h"
@@ -100,8 +100,8 @@ private:
 
     /// Map of registered services, retrieved using GetServicePort.
     mutable std::mutex lock;
-    ankerl::unordered_dense::map<std::string, SessionRequestHandlerFactory> registered_services;
-    ankerl::unordered_dense::map<std::string, Kernel::KClientPort*> service_ports;
+    ::Common::unordered_map<std::string, SessionRequestHandlerFactory> registered_services;
+    ::Common::unordered_map<std::string, Kernel::KClientPort*> service_ports;
 
     /// Kernel context
     Kernel::KernelCore& kernel;

src/core/hle/service/vi/conductor.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <memory>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_types.h"
 #include "common/polyfill_thread.h"
@@ -49,7 +49,7 @@ private:
 private:
     Core::System& m_system;
     Container& m_container;
-    ankerl::unordered_dense::map<u64, VsyncManager> m_vsync_managers;
+    ::Common::unordered_map<u64, VsyncManager> m_vsync_managers;
     std::shared_ptr<Core::Timing::EventType> m_event;
     Common::Event m_signal;
     std::jthread m_thread;

src/core/launch_timestamp_cache.cpp

@@ -8,7 +8,7 @@
 #include <mutex>
 #include <sstream>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
@@ -21,8 +21,8 @@
 namespace Core::LaunchTimestampCache {
 namespace {
 
-using CacheMap = ankerl::unordered_dense::map<u64, s64>;
-using CountMap = ankerl::unordered_dense::map<u64, u64>;
+using CacheMap = ::Common::unordered_map<u64, s64>;
+using CountMap = ::Common::unordered_map<u64, u64>;
 
 std::mutex g_mutex;
 CacheMap g_cache;

src/dynarmic/CMakeLists.txt

@@ -120,7 +120,6 @@ if (NOT Boost_FOUND)
 endif()
 
 find_package(fmt 8 CONFIG)
-find_package(unordered_dense REQUIRED)
 
 if ("arm64" IN_LIST ARCHITECTURE OR DYNARMIC_TESTS)
     find_package(oaknut 2.0.1 CONFIG)

src/dynarmic/CMakeModules/dynarmicConfig.cmake.in

@@ -8,7 +8,6 @@ if (NOT @BUILD_SHARED_LIBS@)
     find_dependency(Boost 1.57)
     find_dependency(fmt 9)
     find_dependency(mcl 0.1.12 EXACT)
-    find_dependency(unordered_dense)
 
     if ("arm64" IN_LIST ARCHITECTURE)
         find_dependency(oaknut 2.0.1)

src/dynarmic/src/dynarmic/CMakeLists.txt

@@ -387,7 +387,6 @@ set_target_properties(dynarmic PROPERTIES
 
 target_compile_options(dynarmic PRIVATE ${DYNARMIC_CXX_FLAGS})
 
-target_link_libraries(dynarmic PRIVATE unordered_dense::unordered_dense)
 target_link_libraries(dynarmic PUBLIC fmt::fmt common)
 
 if (BOOST_NO_HEADERS)

src/dynarmic/src/dynarmic/backend/arm64/address_space.cpp

@@ -75,7 +75,7 @@ CodePtr AddressSpace::GetOrEmit(IR::LocationDescriptor descriptor) {
     return block_info.entry_point;
 }
 
-void AddressSpace::InvalidateBasicBlocks(const ankerl::unordered_dense::set<IR::LocationDescriptor>& descriptors) {
+void AddressSpace::InvalidateBasicBlocks(const ::Common::unordered_set<IR::LocationDescriptor>& descriptors) {
     UnprotectCodeMemory();
 
     for (const auto& descriptor : descriptors) {

src/dynarmic/src/dynarmic/backend/arm64/address_space.h

@@ -14,7 +14,8 @@
 #include "common/common_types.h"
 #include <oaknut/code_block.hpp>
 #include <oaknut/oaknut.hpp>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 
 #include "dynarmic/backend/arm64/emit_arm64.h"
 #include "dynarmic/backend/arm64/fastmem.h"
@@ -41,7 +42,7 @@ public:
 
     CodePtr GetOrEmit(IR::LocationDescriptor descriptor);
 
-    void InvalidateBasicBlocks(const ankerl::unordered_dense::set<IR::LocationDescriptor>& descriptors);
+    void InvalidateBasicBlocks(const ::Common::unordered_set<IR::LocationDescriptor>& descriptors);
 
     void ClearCache();
 protected:
@@ -76,9 +77,9 @@ protected:
     // A IR::LocationDescriptor will have one current CodePtr.
     // However, there can be multiple other CodePtrs which are older, previously invalidated blocks.
     std::map<CodePtr, IR::LocationDescriptor> reverse_block_entries;
-    ankerl::unordered_dense::map<IR::LocationDescriptor, CodePtr> block_entries;
-    ankerl::unordered_dense::map<CodePtr, EmittedBlockInfo> block_infos;
-    ankerl::unordered_dense::map<IR::LocationDescriptor, ankerl::unordered_dense::set<CodePtr>> block_references;
+    ::Common::unordered_map<IR::LocationDescriptor, CodePtr> block_entries;
+    ::Common::unordered_map<CodePtr, EmittedBlockInfo> block_infos;
+    ::Common::unordered_map<IR::LocationDescriptor, ::Common::unordered_set<CodePtr>> block_references;
 
     ExceptionHandler exception_handler;
     FastmemManager fastmem_manager;

src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "common/common_types.h"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "dynarmic/backend/arm64/fastmem.h"
 #include "dynarmic/interface/A32/coprocessor.h"
@@ -105,8 +105,8 @@ struct EmittedBlockInfo {
     CodePtr entry_point;
     std::size_t size;
     std::vector<Relocation> relocations;
-    ankerl::unordered_dense::map<IR::LocationDescriptor, std::vector<BlockRelocation>> block_relocations;
-    ankerl::unordered_dense::map<std::ptrdiff_t, FastmemPatchInfo> fastmem_patch_info;
+    ::Common::unordered_map<IR::LocationDescriptor, std::vector<BlockRelocation>> block_relocations;
+    ::Common::unordered_map<std::ptrdiff_t, FastmemPatchInfo> fastmem_patch_info;
 };
 
 struct EmitConfig {

src/dynarmic/src/dynarmic/backend/arm64/fastmem.h

@@ -10,7 +10,7 @@
 
 #include <cstddef>
 #include <tuple>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_set.h"
 
 #include "dynarmic/mcl/bit.hpp"
 #include "common/common_types.h"
@@ -59,7 +59,7 @@ public:
 
 private:
     ExceptionHandler& exception_handler;
-    ankerl::unordered_dense::set<DoNotFastmemMarker, DoNotFastmemMarkerHash> do_not_fastmem;
+    ::Common::unordered_set<DoNotFastmemMarker, DoNotFastmemMarkerHash> do_not_fastmem;
 };
 
 }  // namespace Dynarmic::Backend::Arm64

src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h

@@ -18,7 +18,8 @@
 #include "common/common_types.h"
 #include "dynarmic/mcl/is_instance_of_template.hpp"
 #include <oaknut/oaknut.hpp>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 
 #include "dynarmic/backend/arm64/stack_layout.h"
 #include "dynarmic/ir/cond.h"
@@ -336,7 +337,7 @@ private:
     std::array<HostLocInfo, SpillCount> spills;
 
     mutable std::size_t alloc_candidate_index = 0;
-    ankerl::unordered_dense::set<const IR::Inst*> defined_insts;
+    ::Common::unordered_set<const IR::Inst*> defined_insts;
 };
 
 template<typename T>

src/dynarmic/src/dynarmic/backend/block_range_information.cpp

@@ -11,13 +11,13 @@
 #include <boost/icl/interval_map.hpp>
 #include <boost/icl/interval_set.hpp>
 #include "common/common_types.h"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_set.h"
 
 namespace Dynarmic::Backend {
 
 template<typename P>
 void BlockRangeInformation<P>::AddRange(boost::icl::discrete_interval<P> range, IR::LocationDescriptor location) {
-    block_ranges.add(std::make_pair(range, ankerl::unordered_dense::set<IR::LocationDescriptor>{location}));
+    block_ranges.add(std::make_pair(range, ::Common::unordered_set<IR::LocationDescriptor>{location}));
 }
 
 template<typename P>
@@ -26,8 +26,8 @@ void BlockRangeInformation<P>::ClearCache() {
 }
 
 template<typename P>
-ankerl::unordered_dense::set<IR::LocationDescriptor> BlockRangeInformation<P>::InvalidateRanges(const boost::icl::interval_set<P>& ranges) {
-    ankerl::unordered_dense::set<IR::LocationDescriptor> erase_locations;
+::Common::unordered_set<IR::LocationDescriptor> BlockRangeInformation<P>::InvalidateRanges(const boost::icl::interval_set<P>& ranges) {
+    ::Common::unordered_set<IR::LocationDescriptor> erase_locations;
     for (auto invalidate_interval : ranges) {
         auto pair = block_ranges.equal_range(invalidate_interval);
         for (auto it = pair.first; it != pair.second; ++it)

src/dynarmic/src/dynarmic/backend/block_range_information.h

@@ -12,7 +12,8 @@
 
 #include <boost/icl/interval_map.hpp>
 #include <boost/icl/interval_set.hpp>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 
 #include "dynarmic/ir/location_descriptor.h"
 
@@ -23,8 +24,8 @@ class BlockRangeInformation {
 public:
     void AddRange(boost::icl::discrete_interval<P> range, IR::LocationDescriptor location);
     void ClearCache();
-    ankerl::unordered_dense::set<IR::LocationDescriptor> InvalidateRanges(const boost::icl::interval_set<P>& ranges);
-    boost::icl::interval_map<P, ankerl::unordered_dense::set<IR::LocationDescriptor>> block_ranges;
+    ::Common::unordered_set<IR::LocationDescriptor> InvalidateRanges(const boost::icl::interval_set<P>& ranges);
+    boost::icl::interval_map<P, ::Common::unordered_set<IR::LocationDescriptor>> block_ranges;
 };
 
 }  // namespace Dynarmic::Backend

src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp

@@ -17,7 +17,7 @@
 #include <optional>
 #include <shared_mutex>
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <fmt/format.h>
 #include <sys/mman.h>
 
@@ -55,7 +55,7 @@ class SigHandler {
         });
     }
 
-    ankerl::unordered_dense::map<u64, CodeBlockInfo> code_block_infos;
+    ::Common::unordered_map<u64, CodeBlockInfo> code_block_infos;
     std::shared_mutex code_block_infos_mutex;
     struct sigaction old_sa_segv;
     struct sigaction old_sa_bus;

src/dynarmic/src/dynarmic/backend/loongarch64/a32_address_space.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "dynarmic/backend/loongarch64/lagoon_cpp.h"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "dynarmic/backend/loongarch64/code_block.h"
 #include "dynarmic/backend/loongarch64/emit_loongarch64.h"
@@ -53,8 +53,8 @@ private:
     const A32::UserConfig conf;
     CodeBlock cb;
 
-    ankerl::unordered_dense::map<u64, CodePtr> block_entries;
-    ankerl::unordered_dense::map<u64, EmittedBlockInfo> block_infos;
+    ::Common::unordered_map<u64, CodePtr> block_entries;
+    ::Common::unordered_map<u64, EmittedBlockInfo> block_infos;
 
 public:
     struct PreludeInfo {

src/dynarmic/src/dynarmic/backend/loongarch64/reg_alloc.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "dynarmic/backend/loongarch64/lagoon_cpp.h"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/assert.h"
 #include "common/common_types.h"

src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <biscuit/assembler.hpp>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "dynarmic/backend/riscv64/code_block.h"
 #include "dynarmic/backend/riscv64/emit_riscv64.h"
@@ -74,8 +74,8 @@ private:
     CodeBlock cb;
     biscuit::Assembler as;
 
-    ankerl::unordered_dense::map<u64, CodePtr> block_entries;
-    ankerl::unordered_dense::map<u64, EmittedBlockInfo> block_infos;
+    ::Common::unordered_map<u64, CodePtr> block_entries;
+    ::Common::unordered_map<u64, EmittedBlockInfo> block_infos;
 
     struct PreludeInfo {
         CodePtr end_of_prelude;

src/dynarmic/src/dynarmic/backend/riscv64/reg_alloc.h

@@ -19,7 +19,7 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "dynarmic/mcl/is_instance_of_template.hpp"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "dynarmic/backend/riscv64/stack_layout.h"
 #include "dynarmic/ir/cond.h"

src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.h

@@ -13,7 +13,8 @@
 #include <set>
 #include <tuple>
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 
 #include "dynarmic/backend/block_range_information.h"
 #include "dynarmic/backend/x64/a32_jitstate.h"
@@ -126,11 +127,11 @@ public:
     RegAlloc reg_alloc; //reusable reg alloc
     BlockRangeInformation<u32> block_ranges;
     std::array<FastDispatchEntry, fast_dispatch_table_size> fast_dispatch_table;
-    ankerl::unordered_dense::map<u64, FastmemPatchInfo> fastmem_patch_info;
-    ankerl::unordered_dense::map<std::tuple<bool, size_t, int, int>, void (*)()> read_fallbacks;
-    ankerl::unordered_dense::map<std::tuple<bool, size_t, int, int>, void (*)()> write_fallbacks;
-    ankerl::unordered_dense::map<std::tuple<bool, size_t, int, int>, void (*)()> exclusive_write_fallbacks;
-    ankerl::unordered_dense::set<DoNotFastmemMarker> do_not_fastmem;
+    ::Common::unordered_map<u64, FastmemPatchInfo> fastmem_patch_info;
+    ::Common::unordered_map<std::tuple<bool, size_t, int, int>, void (*)()> read_fallbacks;
+    ::Common::unordered_map<std::tuple<bool, size_t, int, int>, void (*)()> write_fallbacks;
+    ::Common::unordered_map<std::tuple<bool, size_t, int, int>, void (*)()> exclusive_write_fallbacks;
+    ::Common::unordered_set<DoNotFastmemMarker> do_not_fastmem;
     boost::container::stable_vector<Xbyak::Label> shared_labels;
     void (*memory_read_128)() = nullptr;   // Dummy
     void (*memory_write_128)() = nullptr;  // Dummy

src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.h

@@ -12,7 +12,8 @@
 #include <map>
 #include <optional>
 #include <tuple>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 #include <boost/container/static_vector.hpp>
 
 #include "dynarmic/backend/block_range_information.h"
@@ -122,11 +123,11 @@ public:
     RegAlloc reg_alloc; //reusable reg alloc
     BlockRangeInformation<u64> block_ranges;
     std::array<FastDispatchEntry, fast_dispatch_table_size> fast_dispatch_table;
-    ankerl::unordered_dense::map<u64, FastmemPatchInfo> fastmem_patch_info;
-    ankerl::unordered_dense::map<std::tuple<bool, size_t, int, int>, void (*)()> read_fallbacks;
-    ankerl::unordered_dense::map<std::tuple<bool, size_t, int, int>, void (*)()> write_fallbacks;
-    ankerl::unordered_dense::map<std::tuple<bool, size_t, int, int>, void (*)()> exclusive_write_fallbacks;
-    ankerl::unordered_dense::set<DoNotFastmemMarker> do_not_fastmem;
+    ::Common::unordered_map<u64, FastmemPatchInfo> fastmem_patch_info;
+    ::Common::unordered_map<std::tuple<bool, size_t, int, int>, void (*)()> read_fallbacks;
+    ::Common::unordered_map<std::tuple<bool, size_t, int, int>, void (*)()> write_fallbacks;
+    ::Common::unordered_map<std::tuple<bool, size_t, int, int>, void (*)()> exclusive_write_fallbacks;
+    ::Common::unordered_set<DoNotFastmemMarker> do_not_fastmem;
     boost::container::stable_vector<Xbyak::Label> shared_labels;
     const void* terminal_handler_pop_rsb_hint = nullptr;
     const void* terminal_handler_fast_dispatch_hint = nullptr;

src/dynarmic/src/dynarmic/backend/x64/constant_pool.h

@@ -14,7 +14,7 @@
 #include <utility>
 
 #include "common/common_types.h"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include "dynarmic/backend/x64/xbyak.h"
 
 namespace Dynarmic::Backend::X64 {
@@ -43,7 +43,7 @@ private:
         }
     };
 
-    ankerl::unordered_dense::map<ConstantT, void*, ConstantHash> constant_info;
+    ::Common::unordered_map<ConstantT, void*, ConstantHash> constant_info;
     std::span<ConstantT> pool;
     std::size_t insertion_point;
 };

src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp

@@ -14,7 +14,8 @@
 #include <boost/variant/detail/apply_visitor_binary.hpp>
 #include "dynarmic/mcl/bit.hpp"
 #include "common/common_types.h"
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 
 #include "dynarmic/backend/x64/block_of_code.h"
 #include "dynarmic/backend/x64/nzcv_util.h"
@@ -396,7 +397,7 @@ void EmitX64::ClearCache() {
     PerfMapClear();
 }
 
-void EmitX64::InvalidateBasicBlocks(const ankerl::unordered_dense::set<IR::LocationDescriptor>& locations) {
+void EmitX64::InvalidateBasicBlocks(const ::Common::unordered_set<IR::LocationDescriptor>& locations) {
     code.EnableWriting();
     for (const auto& descriptor : locations) {
         if (auto const it = block_descriptors.find(descriptor); it != block_descriptors.end()) {

src/dynarmic/src/dynarmic/backend/x64/emit_x64.h

@@ -16,7 +16,8 @@
 #include <type_traits>
 #include <vector>
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 #include <boost/container/stable_vector.hpp>
 #include <boost/container/small_vector.hpp>
 
@@ -88,7 +89,7 @@ public:
     virtual void ClearCache();
 
     /// Invalidates a selection of basic blocks.
-    void InvalidateBasicBlocks(const ankerl::unordered_dense::set<IR::LocationDescriptor>& locations);
+    void InvalidateBasicBlocks(const ::Common::unordered_set<IR::LocationDescriptor>& locations);
 
 //protected:
     // Microinstruction emitters
@@ -131,8 +132,8 @@ public:
     // State
     BlockOfCode& code;
     ExceptionHandler exception_handler;
-    ankerl::unordered_dense::map<IR::LocationDescriptor, BlockDescriptor> block_descriptors;
-    ankerl::unordered_dense::map<IR::LocationDescriptor, PatchInformation> patch_information;
+    ::Common::unordered_map<IR::LocationDescriptor, BlockDescriptor> block_descriptors;
+    ::Common::unordered_map<IR::LocationDescriptor, PatchInformation> patch_information;
 
     // We need materialized protected members
     friend class A64EmitX64;

src/dynarmic/src/dynarmic/backend/x64/xbyak.h

@@ -4,10 +4,11 @@
 #pragma once
 
 // You must ensure this matches with src/common/x64/xbyak.h on root dir
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
+#include "common/container/unordered_set.h"
 #include <boost/unordered_map.hpp>
-#define XBYAK_STD_UNORDERED_SET ankerl::unordered_dense::set
-#define XBYAK_STD_UNORDERED_MAP ankerl::unordered_dense::map
+#define XBYAK_STD_UNORDERED_SET ::Common::unordered_set
+#define XBYAK_STD_UNORDERED_MAP ::Common::unordered_map
 #define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap
 #include <xbyak/xbyak.h>
 #include <xbyak/xbyak_util.h>

src/dynarmic/src/dynarmic/common/context.h

@@ -67,7 +67,9 @@
 #else
 #   define CTX_SP (_UC_MACHINE_SP(ucontext))
 #endif
-#elif defined(ARCHITECTURE_arm64)
+#endif
+
+#if defined(ARCHITECTURE_arm64)
 #    if defined(__APPLE__)
 #        define CTX_PC (mctx->__ss.__pc)
 #        define CTX_SP (mctx->__ss.__sp)

src/dynarmic/src/dynarmic/ir/opt_passes.cpp

@@ -11,7 +11,7 @@
 #include <map>
 #include <bit>
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include "boost/container/small_vector.hpp"
 #include "dynarmic/frontend/A32/a32_ir_emitter.h"
 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
@@ -1433,7 +1433,7 @@ static void VerificationPass(const IR::Block& block) {
             ASSERT(IR::AreTypesCompatible(t1, t2));
         }
     }
-    ankerl::unordered_dense::map<IR::Inst*, size_t> actual_uses;
+    ::Common::unordered_map<IR::Inst*, size_t> actual_uses;
     for (auto const& inst : block.instructions) {
         for (size_t i = 0; i < inst.NumArgs(); i++)
             if (IR::Value const arg = inst.GetArg(i); !arg.IsImmediate())

src/dynarmic/tests/A64/fibonacci.cpp

@@ -8,7 +8,7 @@
 
 #include <array>
 #include <exception>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include <catch2/catch_test_macros.hpp>
 #include "common/common_types.h"
@@ -23,7 +23,7 @@ namespace {
 class MyEnvironment final : public A64::UserCallbacks {
 public:
     u64 ticks_left = 0;
-    ankerl::unordered_dense::map<u64, u8> memory{};
+    ::Common::unordered_map<u64, u8> memory{};
 
     u8 MemoryRead8(u64 vaddr) override {
         return memory[vaddr];

src/dynarmic/tests/A64/testenv.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "dynarmic/interface/A64/a64.h"
@@ -17,7 +17,7 @@ using Vector = Dynarmic::A64::Vector;
 
 class A64TestEnv : public Dynarmic::A64::UserCallbacks {
 public:
-    ankerl::unordered_dense::map<u64, u8> modified_memory;
+    ::Common::unordered_map<u64, u8> modified_memory;
     std::vector<u32> code_mem;
     u64 ticks_left = 0;
     u64 code_mem_start_address = 0;

src/dynarmic/tests/CMakeLists.txt

@@ -24,7 +24,7 @@ add_executable(dynarmic_tests
     A64/real_world.cpp
     A64/testenv.h
 )
-target_link_libraries(dynarmic_tests PRIVATE merry::oaknut unordered_dense::unordered_dense)
+target_link_libraries(dynarmic_tests PRIVATE merry::oaknut)
 
 if (DYNARMIC_TESTS_USE_UNICORN)
     target_link_libraries(dynarmic_tests PRIVATE Unicorn::Unicorn)
@@ -72,7 +72,7 @@ add_executable(dynarmic_print_info
     print_info.cpp
 )
 create_target_directory_groups(dynarmic_print_info)
-target_link_libraries(dynarmic_print_info PRIVATE dynarmic fmt::fmt unordered_dense::unordered_dense)
+target_link_libraries(dynarmic_print_info PRIVATE dynarmic fmt::fmt)
 if (BOOST_NO_HEADERS)
     target_link_libraries(dynarmic_print_info PRIVATE Boost::variant Boost::icl Boost::pool)
 else()
@@ -93,7 +93,7 @@ add_executable(dynarmic_test_generator
 
 create_target_directory_groups(dynarmic_test_generator)
 
-target_link_libraries(dynarmic_test_generator PRIVATE dynarmic fmt::fmt unordered_dense::unordered_dense)
+target_link_libraries(dynarmic_test_generator PRIVATE dynarmic fmt::fmt)
 if (BOOST_NO_HEADERS)
     target_link_libraries(dynarmic_test_generator PRIVATE Boost::variant Boost::icl Boost::pool)
 else()
@@ -110,7 +110,7 @@ add_executable(dynarmic_test_reader
     test_reader.cpp
 )
 create_target_directory_groups(dynarmic_test_reader)
-target_link_libraries(dynarmic_test_reader PRIVATE dynarmic fmt::fmt unordered_dense::unordered_dense)
+target_link_libraries(dynarmic_test_reader PRIVATE dynarmic fmt::fmt)
 if (BOOST_NO_HEADERS)
     target_link_libraries(dynarmic_test_reader PRIVATE Boost::variant Boost::icl Boost::pool)
 else()
@@ -123,7 +123,7 @@ target_compile_definitions(dynarmic_test_reader PRIVATE FMT_USE_USER_DEFINED_LIT
 #
 create_target_directory_groups(dynarmic_tests)
 
-target_link_libraries(dynarmic_tests PRIVATE dynarmic Catch2::Catch2WithMain fmt::fmt unordered_dense::unordered_dense)
+target_link_libraries(dynarmic_tests PRIVATE dynarmic Catch2::Catch2WithMain fmt::fmt)
 if (BOOST_NO_HEADERS)
     target_link_libraries(dynarmic_tests PRIVATE Boost::variant Boost::icl Boost::pool)
 else()

src/hid_core/frontend/emulated_console.h

@@ -11,14 +11,13 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #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"
@@ -185,7 +184,7 @@ private:
 
     mutable std::mutex mutex;
     mutable std::mutex callback_mutex;
-    ankerl::unordered_dense::map<int, ConsoleUpdateCallback> callback_list;
+    ::Common::unordered_map<int, ConsoleUpdateCallback> callback_list;
     int last_callback_key = 0;
 
     // Stores the current status of all console input

src/hid_core/frontend/emulated_controller.h

@@ -14,7 +14,7 @@
 #include <vector>
 #include <atomic>
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_types.h"
 #include "common/input.h"
@@ -636,7 +636,7 @@ private:
     ControllerMotionDevices virtual_motion_devices;
 
     mutable std::mutex callback_mutex;
-    ankerl::unordered_dense::map<int, ControllerUpdateCallback> callback_list;
+    ::Common::unordered_map<int, ControllerUpdateCallback> callback_list;
     int last_callback_key = 0;
 
     // Stores the current status of all controller input

src/hid_core/frontend/emulated_devices.h

@@ -10,7 +10,7 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include "common/common_types.h"
@@ -205,7 +205,7 @@ private:
 
     mutable std::mutex mutex;
     mutable std::mutex callback_mutex;
-    ankerl::unordered_dense::map<int, InterfaceUpdateCallback> callback_list;
+    ::Common::unordered_map<int, InterfaceUpdateCallback> callback_list;
     int last_callback_key = 0;
 
     // Stores the current status of all external device input

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 {

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"

src/input_common/drivers/android.h

@@ -90,7 +90,7 @@ public:
     Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
 
 private:
-    ankerl::unordered_dense::map<PadIdentifier, jobject> input_devices;
+    ::Common::unordered_map<PadIdentifier, jobject> input_devices;
 
     /// Returns the correct identifier corresponding to the player index
     PadIdentifier GetIdentifier(const std::string& guid, size_t port) const;

src/input_common/drivers/mouse.cpp

@@ -135,32 +135,25 @@ void Mouse::UpdateMotionInput() {
 
 void Mouse::Move(int x, int y, int center_x, int center_y) {
     if (IsMousePanningEnabled()) {
-        const auto mouse_change =
-            (Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y)).Cast<float>();
-        const float x_sensitivity =
-            Settings::values.mouse_panning_x_sensitivity.GetValue() * default_panning_sensitivity;
-        const float y_sensitivity =
-            Settings::values.mouse_panning_y_sensitivity.GetValue() * default_panning_sensitivity;
-        const float deadzone_counterweight =
-            Settings::values.mouse_panning_deadzone_counterweight.GetValue() *
-            default_deadzone_counterweight;
-
+        auto const mouse_change_int = Common::Vec2<int>(x, y) - Common::Vec2<int>(center_x, center_y);
+        auto const mouse_change = Common::Vec2<float>(float(mouse_change_int.x), float(mouse_change_int.y));
+        auto const x_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;
+        auto const deadzone_cw = Settings::values.mouse_panning_deadzone_counterweight.GetValue() * default_deadzone_counterweight;
         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]
+        // Bind the mouse change to [0 <= deadzone_cw <= 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::Vec2<int>(x, y) - mouse_origin;
         const float x_sensitivity =
             Settings::values.mouse_panning_x_sensitivity.GetValue() * default_stick_sensitivity;
         const float y_sensitivity =

src/input_common/drivers/sdl_driver.cpp

@@ -732,7 +732,7 @@ SDLDriver::~SDLDriver() {
 
 std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const {
     std::vector<Common::ParamPackage> devices;
-    ankerl::unordered_dense::map<int, std::shared_ptr<SDLJoystick>> joycon_pairs;
+    ::Common::unordered_map<int, std::shared_ptr<SDLJoystick>> joycon_pairs;
     for (const auto& [key, value] : joystick_map) {
         for (const auto& joystick : value) {
             if (!joystick->GetSDLJoystick()) {

src/input_common/drivers/sdl_driver.h

@@ -9,7 +9,7 @@
 #include <atomic>
 #include <mutex>
 #include <thread>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include <SDL3/SDL.h>
 
@@ -117,7 +117,7 @@ private:
     Common::SPSCQueue<VibrationRequest> vibration_queue;
 
     /// Map of GUID of a list of corresponding virtual Joysticks
-    ankerl::unordered_dense::map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
+    ::Common::unordered_map<Common::UUID, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map;
     std::mutex joystick_map_mutex;
 
     bool start_thread = false;

src/input_common/input_engine.h

@@ -8,7 +8,7 @@
 
 #include <functional>
 #include <mutex>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_types.h"
 #include "common/input.h"
@@ -270,10 +270,10 @@ protected:
 
 private:
     struct ControllerData {
-        ankerl::unordered_dense::map<int, bool> buttons;
-        ankerl::unordered_dense::map<int, u8> hat_buttons;
-        ankerl::unordered_dense::map<int, float> axes;
-        ankerl::unordered_dense::map<int, BasicMotion> motions;
+        ::Common::unordered_map<int, bool> buttons;
+        ::Common::unordered_map<int, u8> hat_buttons;
+        ::Common::unordered_map<int, float> axes;
+        ::Common::unordered_map<int, BasicMotion> motions;
         Common::Input::BatteryLevel battery{};
         Common::Input::BodyColorStatus color{};
         Common::Input::CameraStatus camera{};
@@ -301,8 +301,8 @@ private:
     bool configuring{false};
     const std::string input_engine;
     int last_callback_key = 0;
-    ankerl::unordered_dense::map<PadIdentifier, ControllerData> controller_list;
-    ankerl::unordered_dense::map<int, InputIdentifier> callback_list;
+    ::Common::unordered_map<PadIdentifier, ControllerData> controller_list;
+    ::Common::unordered_map<int, InputIdentifier> callback_list;
     MappingCallback mapping_callback;
 };
 

src/input_common/main.h

@@ -8,7 +8,7 @@
 
 #include <memory>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 namespace Common {
@@ -56,9 +56,9 @@ enum class InputType { None, Button, Stick, Motion, Touch };
  * Given a ParamPackage for a Device returned from `GetInputDevices`, attempt to get the default
  * mapping for the device.
  */
-using AnalogMapping = ankerl::unordered_dense::map<Settings::NativeAnalog::Values, Common::ParamPackage>;
-using ButtonMapping = ankerl::unordered_dense::map<Settings::NativeButton::Values, Common::ParamPackage>;
-using MotionMapping = ankerl::unordered_dense::map<Settings::NativeMotion::Values, Common::ParamPackage>;
+using AnalogMapping = ::Common::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage>;
+using ButtonMapping = ::Common::unordered_map<Settings::NativeButton::Values, Common::ParamPackage>;
+using MotionMapping = ::Common::unordered_map<Settings::NativeMotion::Values, Common::ParamPackage>;
 
 class InputSubsystem {
 public:

src/shader_recompiler/backend/spirv/spirv_emit_context.h

@@ -9,7 +9,7 @@
 #include <array>
 
 #include <sirit/sirit.h>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_set.h"
 
 #include "shader_recompiler/backend/bindings.h"
 #include "shader_recompiler/frontend/ir/program.h"
@@ -370,7 +370,7 @@ public:
     Id load_const_func_u32x4{};
 
     // Sirit::Id doesn't play nice with *::set<>
-    ankerl::unordered_dense::set<u32> non_uniform_ids;
+    ::Common::unordered_set<u32> non_uniform_ids;
 
     bool uses_nonuniform_sampled_image{};
     bool uses_nonuniform_storage_image{};

src/shader_recompiler/environment.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <array>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 
 #include "common/common_types.h"
 #include "shader_recompiler/program_header.h"
@@ -126,9 +126,9 @@ protected:
     u32 start_address{};
     bool is_proprietary_driver{};
 public:
-    ankerl::unordered_dense::map<CbufWordKey, u32, CbufWordKeyHash> cbuf_word_cache;
-    ankerl::unordered_dense::map<HandleKey,  u32, HandleKeyHash> handle_cache;
-    ankerl::unordered_dense::map<const IR::Inst*, ConstBufferAddr> track_cache;
+    ::Common::unordered_map<CbufWordKey, u32, CbufWordKeyHash> cbuf_word_cache;
+    ::Common::unordered_map<HandleKey,  u32, HandleKeyHash> handle_cache;
+    ::Common::unordered_map<const IR::Inst*, ConstBufferAddr> track_cache;
 };
 
 } // namespace Shader

src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <memory>
 #include <string>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <utility>
 #include <vector>
 
@@ -390,7 +390,7 @@ private:
                    std::optional<Node> return_label) {
         Statement* const false_stmt{pool.Create(Identity{}, IR::Condition{false}, &root_stmt)};
         Tree& root{root_stmt.children};
-        ankerl::unordered_dense::map<Flow::Block*, Node> local_labels;
+        ::Common::unordered_map<Flow::Block*, Node> local_labels;
         local_labels.reserve(function.blocks.size());
 
         for (Flow::Block& block : function.blocks) {

src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp

@@ -19,7 +19,7 @@
 #include <deque>
 #include <map>
 #include <span>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <variant>
 #include <vector>
 

src/shader_recompiler/ir_opt/texture_pass.cpp

@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <bit>
 #include <optional>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <tuple>
 #include <limits>
 #include <boost/container/small_vector.hpp>

src/tests/common/fibers.cpp

@@ -11,7 +11,7 @@
 #include <mutex>
 #include <stdexcept>
 #include <thread>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include <catch2/catch_test_macros.hpp>
@@ -39,7 +39,7 @@ public:
 
 private:
     mutable std::mutex mutex;
-    ankerl::unordered_dense::map<std::thread::id, u32> ids;
+    ::Common::unordered_map<std::thread::id, u32> ids;
 };
 
 class TestControl1 {

src/tests/video_core/memory_tracker.cpp

@@ -3,7 +3,7 @@
 
 #include <memory>
 #include <stdexcept>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <tuple>
 #include <vector>
 #include <optional>
@@ -65,7 +65,7 @@ public:
     }
 
 private:
-    ankerl::unordered_dense::map<u64, int> page_table;
+    ::Common::unordered_map<u64, int> page_table;
     std::vector<std::tuple<DAddr, u64, int>> calls;
     size_t update_calls = 0;
 };

src/video_core/buffer_cache/buffer_cache_base.h

@@ -16,7 +16,7 @@
 #include <span>
 #include <vector>
 
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <boost/container/static_vector.hpp>
 #include <boost/container/small_vector.hpp>
 

src/video_core/buffer_cache/memory_tracker_base.h

@@ -11,7 +11,7 @@
 #include <deque>
 #include <limits>
 #include <type_traits>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_set.h"
 #include <utility>
 
 #include "common/alignment.h"
@@ -257,7 +257,7 @@ private:
     std::array<Manager*, NUM_HIGH_PAGES> top_tier{};
     std::deque<std::array<Manager, MANAGER_POOL_SIZE>> manager_pool;
     std::deque<Manager*> free_managers;
-    ankerl::unordered_dense::set<u32> cached_pages;
+    ::Common::unordered_set<u32> cached_pages;
     DeviceTracker* device_tracker = nullptr;
 };
 

src/video_core/control/channel_state_cache.h

@@ -10,7 +10,7 @@
 #include <limits>
 #include <mutex>
 #include <optional>
-#include <ankerl/unordered_dense.h>
+#include "common/container/unordered_map.h"
 #include <vector>
 
 #include "common/common_types.h"
@@ -88,14 +88,14 @@ protected:
 
     std::deque<P> channel_storage;
     std::deque<size_t> free_channel_ids;
-    ankerl::unordered_dense::map<s32, size_t> channel_map;
+    ::Common::unordered_map<s32, size_t> channel_map;
     std::vector<size_t> active_channel_ids;
     struct AddressSpaceRef {
         size_t ref_count;
         size_t storage_id;
         Tegra::MemoryManager* gpu_memory;
     };
-    ankerl::unordered_dense::map<size_t, AddressSpaceRef> address_spaces;
+    ::Common::unordered_map<size_t, AddressSpaceRef> address_spaces;
     mutable std::mutex config_mutex;
 
     virtual void OnGPUASRegister([[maybe_unused]] size_t map_id) {}