Merge branch 'master' into mfc-shuffle

RPCS3 · Sep 17, 2021 · 7b0d693 · 7b0d693
2 parents ead2ca5 + c2ab3c6
commit 7b0d693
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -3377,8 +3377,8 @@ namespace rsx
 			auto scale_result = [](u32 value)
 			{
 				const auto scale = rsx::get_resolution_scale_percent();
-				const auto result = static_cast<u64>(value * 10000) / (scale * scale);
-				return std::max<u32>(1u, result);
+				const auto result = (value * 10000ull) / (scale * scale);
+				return std::max(1u, static_cast<u32>(result));
 			};
 
 			switch (type)