diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2014-08-19 20:17:29 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2014-08-19 22:33:47 -0700 |
| commit | fd1606597904d7c5fe50dc8d611cedc13e184645 (patch) | |
| tree | 0bb3e97b76dd2e8ada7c3bfe5b35509226e1da01 /Source/Core/VideoBackends/Software | |
| parent | 4bf031c0646e91b35777f1ba4e2b0328063bb666 (diff) | |
msvc: resolve all warnings in VideoBackends/Software.
Diffstat (limited to 'Source/Core/VideoBackends/Software')
| -rw-r--r-- | Source/Core/VideoBackends/Software/BPMemLoader.cpp | 12 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWCommandProcessor.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp index b21f3171c5..94a1d091d8 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp @@ -151,10 +151,10 @@ void SWBPWritten(int address, int newvalue) { int regNum = (address >> 1 ) & 0x3; TevReg& reg = bpmem.tevregs[regNum]; - bool konst = reg.type_ra; + bool is_konst = reg.type_ra != 0; - Rasterizer::SetTevReg(regNum, Tev::ALP_C, konst, reg.alpha); - Rasterizer::SetTevReg(regNum, Tev::RED_C, konst, reg.red); + Rasterizer::SetTevReg(regNum, Tev::ALP_C, is_konst, static_cast<s16>(reg.alpha)); + Rasterizer::SetTevReg(regNum, Tev::RED_C, is_konst, static_cast<s16>(reg.red)); break; } @@ -166,10 +166,10 @@ void SWBPWritten(int address, int newvalue) { int regNum = (address >> 1 ) & 0x3; TevReg& reg = bpmem.tevregs[regNum]; - bool konst = reg.type_bg; + bool is_konst = reg.type_bg != 0; - Rasterizer::SetTevReg(regNum, Tev::GRN_C, konst, reg.green); - Rasterizer::SetTevReg(regNum, Tev::BLU_C, konst, reg.blue); + Rasterizer::SetTevReg(regNum, Tev::GRN_C, is_konst, static_cast<s16>(reg.green)); + Rasterizer::SetTevReg(regNum, Tev::BLU_C, is_konst, static_cast<s16>(reg.blue)); break; } diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index 32bc5de486..63b85794ce 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -143,7 +143,7 @@ void RunGpu() void RegisterMMIO(MMIO::Mapping* mmio, u32 base) { // Directly map reads and writes to the cpreg structure. - for (size_t i = 0; i < sizeof (cpreg) / sizeof (u16); ++i) + for (u32 i = 0; i < sizeof (cpreg) / sizeof (u16); ++i) { u16* ptr = ((u16*)&cpreg) + i; mmio->Register(base | (i * 2), @@ -154,7 +154,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base) // Bleh. Apparently SWCommandProcessor does not know about regs 0x40 to // 0x64... - for (size_t i = 0x40; i < 0x64; ++i) + for (u32 i = 0x40; i < 0x64; ++i) { mmio->Register(base | i, MMIO::Constant<u16>(0), |