ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove warnings of -Wsign-compare 

Cast the variable to the coresponding type.
This commit is contained in:
Jun Su 2020-03-23 14:09:41 +08:00
parent 62707986b7
commit 81f8099cc6
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -177,10 +177,10 @@ void AdvancedPane::Update()
const bool enable_custom_rtc_widgets = SConfig::GetInstance().bEnableCustomRTC && !running; const bool enable_custom_rtc_widgets = SConfig::GetInstance().bEnableCustomRTC && !running;
const std::vector<PowerPC::CPUCore>& available_cpu_cores = PowerPC::AvailableCPUCores(); 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) if (available_cpu_cores[i] == SConfig::GetInstance().cpu_core)
m_cpu_emulation_engine_combobox->setCurrentIndex(i); m_cpu_emulation_engine_combobox->setCurrentIndex(int(i));
} }
m_cpu_emulation_engine_combobox->setEnabled(!running); m_cpu_emulation_engine_combobox->setEnabled(!running);

4
Source/Core/VideoBackends/Software/DebugUtil.cpp
View File

@ -136,9 +136,9 @@ static void DumpEfb(const std::string& filename)
u8* data = new u8[EFB_WIDTH * EFB_HEIGHT * 4]; u8* data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
u8* writePtr = data; 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 // ABGR to RGBA
const u32 sample = Common::swap32(EfbInterface::GetColor(x, y)); const u32 sample = Common::swap32(EfbInterface::GetColor(x, y));

4
Source/Core/VideoBackends/Software/Rasterizer.cpp
View File

@ -320,11 +320,11 @@ void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v
scissorTop = 0; scissorTop = 0;
s32 scissorRight = bpmem.scissorBR.x - xoff - 341; s32 scissorRight = bpmem.scissorBR.x - xoff - 341;
if (scissorRight > EFB_WIDTH) if (scissorRight > s32(EFB_WIDTH))
scissorRight = EFB_WIDTH; scissorRight = EFB_WIDTH;
s32 scissorBottom = bpmem.scissorBR.y - yoff - 341; s32 scissorBottom = bpmem.scissorBR.y - yoff - 341;
if (scissorBottom > EFB_HEIGHT) if (scissorBottom > s32(EFB_HEIGHT))
scissorBottom = EFB_HEIGHT; scissorBottom = EFB_HEIGHT;
minx = std::max(minx, scissorLeft); minx = std::max(minx, scissorLeft);

4
Source/Core/VideoBackends/Software/Tev.cpp
View File

@ -567,8 +567,8 @@ void Tev::Indirect(unsigned int stageNum, s32 s, s32 t)
void Tev::Draw() void Tev::Draw()
{ {
ASSERT(Position[0] >= 0 && Position[0] < EFB_WIDTH); ASSERT(Position[0] >= 0 && Position[0] < s32(EFB_WIDTH));
ASSERT(Position[1] >= 0 && Position[1] < EFB_HEIGHT); ASSERT(Position[1] >= 0 && Position[1] < s32(EFB_HEIGHT));
INCSTAT(g_stats.this_frame.tev_pixels_in); INCSTAT(g_stats.this_frame.tev_pixels_in);

6
Source/Core/VideoCommon/BPStructs.cpp
View File

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