diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp index a37e3720ff..808e7959e5 100644 --- a/Source/Core/VideoCommon/BPFunctions.cpp +++ b/Source/Core/VideoCommon/BPFunctions.cpp @@ -158,11 +158,11 @@ ScissorResult::ScissorResult(const BPMemory& bpmemory, std::pair v for (const auto& x_range : x_ranges) { DEBUG_ASSERT(x_range.start < x_range.end); - DEBUG_ASSERT(x_range.end <= EFB_WIDTH); + DEBUG_ASSERT(static_cast(x_range.end) <= EFB_WIDTH); for (const auto& y_range : y_ranges) { DEBUG_ASSERT(y_range.start < y_range.end); - DEBUG_ASSERT(y_range.end <= EFB_HEIGHT); + DEBUG_ASSERT(static_cast(y_range.end) <= EFB_HEIGHT); m_result.emplace_back(x_range, y_range); } } diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h index 2e5aa46936..517e8b3e9b 100644 --- a/Source/Core/VideoCommon/VideoCommon.h +++ b/Source/Core/VideoCommon/VideoCommon.h @@ -12,18 +12,18 @@ #include "VideoCommon/BPMemory.h" // These are accurate (disregarding AA modes). -constexpr u32 EFB_WIDTH = 640; -constexpr u32 EFB_HEIGHT = 528; +constexpr u32 EFB_WIDTH = 640u; +constexpr u32 EFB_HEIGHT = 528u; // Max XFB width is 720. You can only copy out 640 wide areas of efb to XFB // so you need multiple copies to do the full width. // The VI can do horizontal scaling (TODO: emulate). -constexpr u32 MAX_XFB_WIDTH = 720; +constexpr u32 MAX_XFB_WIDTH = 720u; // Although EFB height is 528, 576-line XFB's can be created either with // vertical scaling by the EFB copy operation or copying to multiple XFB's // that are next to each other in memory (TODO: handle that situation). -constexpr u32 MAX_XFB_HEIGHT = 576; +constexpr u32 MAX_XFB_HEIGHT = 576u; #define PRIM_LOG(t, ...) DEBUG_LOG_FMT(VIDEO, t __VA_OPT__(, ) __VA_ARGS__)