diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-12-19 14:41:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 14:41:24 +0100 |
| commit | dcac455a16abf034d565ff123a18c6178ef25883 (patch) | |
| tree | 9ba032708b64772cae4ce0a6c64922e948b0ac28 /Source/Core/VideoCommon/TextureCacheBase.cpp | |
| parent | 5006ac5c518a4e52599e09eb5fc80010d25c2c01 (diff) | |
| parent | a3355a3e4aad867cf5ebc03c12134b8961d39e3c (diff) | |
Merge pull request #6256 from JosJuice/scaled-xfb-copies
Only use the "Scaled EFB Copy" setting for EFB, not XFB
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index e3169d735f..1e63aa36e9 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -1582,10 +1582,9 @@ void TextureCacheBase::CopyRenderTargetToTexture(u32 dstAddr, EFBCopyFormat dstF const unsigned int tex_w = scaleByHalf ? srcRect.GetWidth() / 2 : srcRect.GetWidth(); const unsigned int tex_h = scaleByHalf ? srcRect.GetHeight() / 2 : srcRect.GetHeight(); - unsigned int scaled_tex_w = - g_ActiveConfig.bCopyEFBScaled ? g_renderer->EFBToScaledX(tex_w) : tex_w; - unsigned int scaled_tex_h = - g_ActiveConfig.bCopyEFBScaled ? g_renderer->EFBToScaledY(tex_h) : tex_h; + const bool upscale = is_xfb_copy || g_ActiveConfig.bCopyEFBScaled; + unsigned int scaled_tex_w = upscale ? g_renderer->EFBToScaledX(tex_w) : tex_w; + unsigned int scaled_tex_h = upscale ? g_renderer->EFBToScaledY(tex_h) : tex_h; // Get the base (in memory) format of this efb copy. TextureFormat baseFormat = TexDecoder_GetEFBCopyBaseFormat(dstFormat); |