diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2014-08-19 20:16:50 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2014-08-19 22:33:46 -0700 |
| commit | 4bf031c0646e91b35777f1ba4e2b0328063bb666 (patch) | |
| tree | 9a98fccbb90d608ff1746e4bc8c47bf7819526f3 /Source/Core/VideoCommon/BPStructs.cpp | |
| parent | 043ea31f14a330bfdddfb6d5ab14794675efdd74 (diff) | |
msvc: resolve all warnings in VideoCommon.
Diffstat (limited to 'Source/Core/VideoCommon/BPStructs.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/BPStructs.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp index 6ba663b75d..5f63280ea8 100644 --- a/Source/Core/VideoCommon/BPStructs.cpp +++ b/Source/Core/VideoCommon/BPStructs.cpp @@ -219,7 +219,7 @@ static void BPWritten(const BPCmd& bp) CopyEFB(destAddr, srcRect, PE_copy.tp_realFormat(), bpmem.zcontrol.pixel_format, - PE_copy.intensity_fmt, PE_copy.half_scale); + !!PE_copy.intensity_fmt, !!PE_copy.half_scale); } else { @@ -235,19 +235,19 @@ static void BPWritten(const BPCmd& bp) else yScale = (float)bpmem.dispcopyyscale / 256.0f; - float xfbLines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale); - if ((u32)xfbLines > MAX_XFB_HEIGHT) + float num_xfb_lines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale); + + u32 height = static_cast<u32>(num_xfb_lines); + if (height > MAX_XFB_HEIGHT) { - INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines (%f)", xfbLines); - xfbLines = MAX_XFB_HEIGHT; + INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines: %d (%f)", + height, num_xfb_lines); + height = MAX_XFB_HEIGHT; } u32 width = bpmem.copyMipMapStrideChannels << 4; - u32 height = xfbLines; - Renderer::RenderToXFB(destAddr, srcRect, - width, height, - s_gammaLUT[PE_copy.gamma]); + Renderer::RenderToXFB(destAddr, srcRect, width, height, s_gammaLUT[PE_copy.gamma]); } // Clear the rectangular region after copying it. @@ -565,9 +565,9 @@ static void BPWritten(const BPCmd& bp) // don't compare with changes! int num = (bp.address >> 1) & 0x3; if ((bp.address & 1) == 0) - PixelShaderManager::SetColorChanged(bpmem.tevregs[num].type_ra, num); + PixelShaderManager::SetColorChanged(static_cast<int>(bpmem.tevregs[num].type_ra), num); else - PixelShaderManager::SetColorChanged(bpmem.tevregs[num].type_bg, num); + PixelShaderManager::SetColorChanged(static_cast<int>(bpmem.tevregs[num].type_bg), num); } return; default: |