diff options
| author | Markus Wick <markus+github@selfnet.de> | 2014-12-28 22:22:27 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2014-12-28 22:22:27 +0100 |
| commit | 0f87d9b669e4ec91aaabedee2d8f04514b363cab (patch) | |
| tree | c563586def295dec9ae9bc5025b61c52c156e4e6 /Source/Core/VideoCommon/RenderBase.cpp | |
| parent | 83d9942ca3a4b076cfee761045865359c09515dc (diff) | |
| parent | e1dc0331133c9ca1b1a62cc68b3110a25e70aa38 (diff) | |
Merge pull request #1781 from Armada651/xfb-fixes
D3D: Fix Virtual XFB viewport.
Diffstat (limited to 'Source/Core/VideoCommon/RenderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 50778172cf..9ff2ba83f0 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -67,7 +67,7 @@ PostProcessingShaderImplementation* Renderer::m_post_processor; TargetRectangle Renderer::target_rc; -int Renderer::s_LastEFBScale; +int Renderer::s_last_efb_scale; bool Renderer::XFBWrited; @@ -176,14 +176,14 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int newEFBWidth = newEFBHeight = 0; // TODO: Ugly. Clean up - switch (s_LastEFBScale) + switch (s_last_efb_scale) { case SCALE_AUTO: case SCALE_AUTO_INTEGRAL: newEFBWidth = FramebufferManagerBase::ScaleToVirtualXfbWidth(EFB_WIDTH); newEFBHeight = FramebufferManagerBase::ScaleToVirtualXfbHeight(EFB_HEIGHT); - if (s_LastEFBScale == SCALE_AUTO_INTEGRAL) + if (s_last_efb_scale == SCALE_AUTO_INTEGRAL) { newEFBWidth = ((newEFBWidth-1) / EFB_WIDTH + 1) * EFB_WIDTH; newEFBHeight = ((newEFBHeight-1) / EFB_HEIGHT + 1) * EFB_HEIGHT; @@ -217,7 +217,7 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int case SCALE_3X: case SCALE_4X: default: - efb_scale_numeratorX = efb_scale_numeratorY = s_LastEFBScale - 3; + efb_scale_numeratorX = efb_scale_numeratorY = s_last_efb_scale - 3; efb_scale_denominatorX = efb_scale_denominatorY = 1; @@ -231,7 +231,7 @@ bool Renderer::CalculateTargetSize(unsigned int framebuffer_width, unsigned int break; } - if (s_LastEFBScale > SCALE_AUTO_INTEGRAL) + if (s_last_efb_scale > SCALE_AUTO_INTEGRAL) CalculateTargetScale(EFB_WIDTH, EFB_HEIGHT, &newEFBWidth, &newEFBHeight); if (newEFBWidth != s_target_width || newEFBHeight != s_target_height) |