Parcourir la source

shader_bytecode: Make operator== and operator!= of IpaMode const qualified

These don't affect the state of the struct and can be const member
functions.
Lioncash il y a 7 ans
Parent
commit
272517cf7e
1 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 7 6
      src/video_core/engines/shader_bytecode.h

+ 7 - 6
src/video_core/engines/shader_bytecode.h

@@ -5,9 +5,8 @@
 #pragma once
 #pragma once
 
 
 #include <bitset>
 #include <bitset>
-#include <cstring>
-#include <map>
 #include <string>
 #include <string>
+#include <tuple>
 #include <vector>
 #include <vector>
 
 
 #include <boost/optional.hpp>
 #include <boost/optional.hpp>
@@ -321,11 +320,13 @@ enum class IpaSampleMode : u64 { Default = 0, Centroid = 1, Offset = 2 };
 struct IpaMode {
 struct IpaMode {
     IpaInterpMode interpolation_mode;
     IpaInterpMode interpolation_mode;
     IpaSampleMode sampling_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);
     }
     }
 };
 };