diff options
| author | crueter <crueter@eden-emu.dev> | 2026-08-31 02:58:09 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-08-31 02:58:09 +0200 |
| commit | 7fda6dde73ab9fa1eab40d43c90720a1d9ba054f (patch) | |
| tree | 12753135a33c3002ecb35734ac7c79adc5de85b7 /src/input_common | |
| parent | 106a61c9434b8d61ab8cde0170f6fcac403b28f1 (diff) | |
[common] Switch to boost::unordered_flat containers (#4326)
Replaces all instances of ankerl's unordered map/set with boost's
`unordered_flat_*` classes. This uses std::hash since boost::hash is
actually a lot slower.
Also adds an abstraction layer in `Common` so future changes are quicker
and easier.
Other implementation details:
- ankerl provided hash specializations for tuple and pair, so those were
ported here
- std::erase_if doesn't work on boost, so just used the ADL'd erase_if
This should be about equal or superior performance as unordered_dense for everything except iteration.
Signed-off-by: crueter <crueter@eden-emu.dev>
- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md)
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.
-------------------
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4326
Reviewed-by: Lizzie and Samuel <lizzie@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/drivers/android.h | 2 | ||||
| -rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/drivers/sdl_driver.h | 4 | ||||
| -rw-r--r-- | src/input_common/input_engine.h | 14 | ||||
| -rw-r--r-- | src/input_common/main.h | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/input_common/drivers/android.h b/src/input_common/drivers/android.h index 18678de602..c4663aec5c 100644 --- a/src/input_common/drivers/android.h +++ b/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; diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index dd7e8edc30..91589063b5 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/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()) { diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index bf4a45e83d..9a279e926f 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/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; diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index 7ad40027e4..3613219f56 100644 --- a/src/input_common/input_engine.h +++ b/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; }; diff --git a/src/input_common/main.h b/src/input_common/main.h index d0e447ec2d..3b33ef30eb 100644 --- a/src/input_common/main.h +++ b/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: |
