summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-09-21 22:14:15 +0200
committerLioncash <mathew1800@gmail.com>2018-09-21 22:17:27 +0200
commit272517cf7ebb08afa7ff524394124f9d061bba52 (patch)
tree339993ebfae08e701a5756059cf61a962324ea06
parentMerge pull request #1370 from Hedges/GDBClean (diff)
downloadyuzu-272517cf7ebb08afa7ff524394124f9d061bba52.tar
yuzu-272517cf7ebb08afa7ff524394124f9d061bba52.tar.gz
yuzu-272517cf7ebb08afa7ff524394124f9d061bba52.tar.bz2
yuzu-272517cf7ebb08afa7ff524394124f9d061bba52.tar.lz
yuzu-272517cf7ebb08afa7ff524394124f9d061bba52.tar.xz
yuzu-272517cf7ebb08afa7ff524394124f9d061bba52.tar.zst
yuzu-272517cf7ebb08afa7ff524394124f9d061bba52.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 7e1de0fa1..acd6f5b21 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -5,9 +5,8 @@
#pragma once
#include <bitset>
-#include <cstring>
-#include <map>
#include <string>
+#include <tuple>
#include <vector>
#include <boost/optional.hpp>
@@ -321,11 +320,13 @@ enum class IpaSampleMode : u64 { Default = 0, Centroid = 1, Offset = 2 };
struct IpaMode {
IpaInterpMode interpolation_mode;
IpaSampleMode sampling_mode;
- inline bool operator==(const IpaMode& a) {
- return (a.interpolation_mode == interpolation_mode) && (a.sampling_mode == sampling_mode);
+
+ bool operator==(const IpaMode& a) const {
+ return std::tie(interpolation_mode, sampling_mode) ==
+ std::tie(a.interpolation_mode, a.sampling_mode);
}
- inline bool operator!=(const IpaMode& a) {
- return !((*this) == a);
+ bool operator!=(const IpaMode& a) const {
+ return !operator==(a);
}
};