Skip to content
Permalink
Browse files

Remove warnings of -Wsign-compare

Cast the variable to the coresponding type.
  • Loading branch information
howard0su committed Mar 23, 2020
1 parent 6270798 commit 5d23f17856f6c6d9ef9adcc76afa1feb032ca92f
@@ -177,7 +177,7 @@ void AdvancedPane::Update()
const bool enable_custom_rtc_widgets = SConfig::GetInstance().bEnableCustomRTC && !running;

const std::vector<PowerPC::CPUCore>& available_cpu_cores = PowerPC::AvailableCPUCores();
for (int i = 0; i < available_cpu_cores.size(); ++i)
for (size_t i = 0; i < available_cpu_cores.size(); ++i)
{
if (available_cpu_cores[i] == SConfig::GetInstance().cpu_core)
m_cpu_emulation_engine_combobox->setCurrentIndex(i);
@@ -136,9 +136,9 @@ static void DumpEfb(const std::string& filename)
u8* data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
u8* writePtr = data;

for (int y = 0; y < EFB_HEIGHT; y++)
for (u32 y = 0; y < EFB_HEIGHT; y++)
{
for (int x = 0; x < EFB_WIDTH; x++)
for (u32 x = 0; x < EFB_WIDTH; x++)
{
// ABGR to RGBA
const u32 sample = Common::swap32(EfbInterface::GetColor(x, y));
@@ -320,11 +320,11 @@ void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v
scissorTop = 0;

s32 scissorRight = bpmem.scissorBR.x - xoff - 341;
if (scissorRight > EFB_WIDTH)
if (scissorRight > s32(EFB_WIDTH))
scissorRight = EFB_WIDTH;

s32 scissorBottom = bpmem.scissorBR.y - yoff - 341;
if (scissorBottom > EFB_HEIGHT)
if (scissorBottom > s32(EFB_HEIGHT))
scissorBottom = EFB_HEIGHT;

minx = std::max(minx, scissorLeft);
@@ -567,8 +567,8 @@ void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)

void Tev::Draw()
{
ASSERT(Position[0] >= 0 && Position[0] < EFB_WIDTH);
ASSERT(Position[1] >= 0 && Position[1] < EFB_HEIGHT);
ASSERT(Position[0] >= 0 && Position[0] < s32(EFB_WIDTH));
ASSERT(Position[1] >= 0 && Position[1] < s32(EFB_HEIGHT));

INCSTAT(g_stats.this_frame.tev_pixels_in);

@@ -241,19 +241,19 @@ static void BPWritten(const BPCmd& bp)
// known for configuring these out-of-range copies.
int copy_width = srcRect.GetWidth();
int copy_height = srcRect.GetHeight();
if (srcRect.right > EFB_WIDTH || srcRect.bottom > EFB_HEIGHT)
if (srcRect.right > s32(EFB_WIDTH) || srcRect.bottom > s32(EFB_HEIGHT))
{
WARN_LOG(VIDEO, "Oversized EFB copy: %dx%d (offset %d,%d stride %u)", copy_width, copy_height,
srcRect.left, srcRect.top, destStride);

// Adjust the copy size to fit within the EFB. So that we don't end up with a stretched image,
// instead of clamping the source rectangle, we reduce it by the over-sized amount.
if (copy_width > EFB_WIDTH)
if (copy_width > s32(EFB_WIDTH))
{
srcRect.right -= copy_width - EFB_WIDTH;
copy_width = EFB_WIDTH;
}
if (copy_height > EFB_HEIGHT)
if (copy_height > s32(EFB_HEIGHT))
{
srcRect.bottom -= copy_height - EFB_HEIGHT;
copy_height = EFB_HEIGHT;

0 comments on commit 5d23f17

Please sign in to comment.
You can’t perform that action at this time.