From 5f29840348c4105e54aa39c9a3746f2156dd880b Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Sun, 29 Sep 2019 16:01:47 +0300
Subject: [PATCH] Fix enum vs integer comparison in se_t::operator==

Need to convert left part to its underlying type.
---
 rpcs3/util/endian.hpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/rpcs3/util/endian.hpp b/rpcs3/util/endian.hpp
index 6cd586e96b..6bd873be00 100644
--- a/rpcs3/util/endian.hpp
+++ b/rpcs3/util/endian.hpp
@@ -199,9 +199,20 @@ namespace stx
 		{
 			using R = simple_t<T2>;
 
-			if constexpr ((std::is_integral_v<T> || std::is_enum_v<T>) && (std::is_integral_v<R> || std::is_enum_v<R>) && sizeof(T) >= sizeof(R))
+			if constexpr ((std::is_integral_v<T> || std::is_enum_v<T>) && (std::is_integral_v<R> || std::is_enum_v<R>))
 			{
-				return std::bit_cast<type>(m_data) == std::bit_cast<type>(static_cast<se_t>(rhs));
+				if constexpr (sizeof(T) >= sizeof(R))
+				{
+					if constexpr (std::is_enum_v<T> && std::is_convertible_v<T, int> && std::is_convertible_v<R, int>)
+					{
+						using under = std::underlying_type_t<T>;
+						return std::bit_cast<under>(m_data) == std::bit_cast<under>(static_cast<se_t<under, Swap>>(rhs));
+					}
+					else
+					{
+						return std::bit_cast<type>(m_data) == std::bit_cast<type>(static_cast<se_t>(rhs));
+					}
+				}
 			}
 
 			// Keep outside of if constexpr to make sure it fails on invalid comparison