diff options
| author | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
| commit | adb8bbed900bccf7e7fbfa5e79d3262bede18e21 (patch) | |
| tree | e32c61e43c53fdb73c00b18de3be109b2f0bd722 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 0b6562b53f2d315bfc88d943658c05f75cd8fc2a (diff) | |
| parent | ad64336137013a823c212e4e491dbb435aa11e5f (diff) | |
Merge pull request #2217 from shuffle2/quiet-warnings
quiet some warnings which appear on vs2015.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index c7204257bd..ec73313476 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -872,10 +872,10 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co if (FramebufferManagerBase::LastXfbWidth() != fbStride || FramebufferManagerBase::LastXfbHeight() != fbHeight) { xfbchanged = true; - unsigned int w = (fbStride < 1 || fbStride > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbStride; - unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; - FramebufferManagerBase::SetLastXfbWidth(w); - FramebufferManagerBase::SetLastXfbHeight(h); + unsigned int xfb_w = (fbStride < 1 || fbStride > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbStride; + unsigned int xfb_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; + FramebufferManagerBase::SetLastXfbWidth(xfb_w); + FramebufferManagerBase::SetLastXfbHeight(xfb_h); } // Flip/present backbuffer to frontbuffer here |