diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-08-20 10:57:31 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-08-20 10:57:31 -0700 |
| commit | d29e3331426823b0dcd49a7436a4a8a6bdf60dcf (patch) | |
| tree | 84bbe066f736929fc1b4e381f3c719006070d409 /Source/Core/VideoBackends/Software | |
| parent | a09cf1d8f1bdc58de56b8fbb2d2282b8e59d2e69 (diff) | |
| parent | a9c33075f2f2b8ca6ffb699308a282e385a726b9 (diff) | |
Merge pull request #833 from shuffle2/msvc-improvements
misc improvements for msvc build. -Werror for msvc!
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), |