summaryrefslogtreecommitdiffstats
path: root/src/input_common/input_engine.h
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-02-05 06:40:28 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2022-02-05 19:18:41 +0100
commitcb30fe50cd074fe05dd1d6e4b0d58116d3d98489 (patch)
tree58450d743d317369266bbbea44734725d8b83ea6 /src/input_common/input_engine.h
parentcommon: Implement NewUUID (diff)
downloadyuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.gz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.bz2
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.lz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.xz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.zst
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.zip
Diffstat (limited to 'src/input_common/input_engine.h')
-rw-r--r--src/input_common/input_engine.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h
index fe2faee5a..05e45b877 100644
--- a/src/input_common/input_engine.h
+++ b/src/input_common/input_engine.h
@@ -10,13 +10,13 @@
#include "common/common_types.h"
#include "common/input.h"
+#include "common/new_uuid.h"
#include "common/param_package.h"
-#include "common/uuid.h"
#include "input_common/main.h"
// Pad Identifier of data source
struct PadIdentifier {
- Common::UUID guid{Common::INVALID_UUID};
+ Common::NewUUID guid{};
std::size_t port{};
std::size_t pad{};
@@ -59,7 +59,7 @@ namespace std {
template <>
struct hash<PadIdentifier> {
size_t operator()(const PadIdentifier& pad_id) const noexcept {
- u64 hash_value = pad_id.guid.uuid[1] ^ pad_id.guid.uuid[0];
+ u64 hash_value = pad_id.guid.Hash();
hash_value ^= (static_cast<u64>(pad_id.port) << 32);
hash_value ^= static_cast<u64>(pad_id.pad);
return static_cast<size_t>(hash_value);