The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 14:39:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9109 from stenzek/msaa-efb-readback

Browse Source 
FramebufferManager: Fix EFB readbacks with MSAA on
This commit is contained in:
Connor McLaughlin 2020-09-26 17:46:16 +10:00 committed by GitHub
commit aea0239071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/VideoCommon/FramebufferManager.cpp
View File

@ -258,8 +258,8 @@ AbstractTexture* FramebufferManager::ResolveEFBColorTexture(const MathUtil::Rect
AbstractTexture* FramebufferManager::ResolveEFBDepthTexture(const MathUtil::Rectangle<int>& region, AbstractTexture* FramebufferManager::ResolveEFBDepthTexture(const MathUtil::Rectangle<int>& region,
bool force_r32f) bool force_r32f)
{ {
if (!IsEFBMultisampled() || !force_r32f || if (!IsEFBMultisampled() &&
m_efb_depth_texture->GetFormat() == AbstractTextureFormat::R32F) (!force_r32f || m_efb_depth_texture->GetFormat() == AbstractTextureFormat::D32F))
{ {
return m_efb_depth_texture.get(); return m_efb_depth_texture.get();
} }
@ -271,7 +271,8 @@ AbstractTexture* FramebufferManager::ResolveEFBDepthTexture(const MathUtil::Rect
m_efb_depth_texture->FinishedRendering(); m_efb_depth_texture->FinishedRendering();
g_renderer->BeginUtilityDrawing(); g_renderer->BeginUtilityDrawing();
g_renderer->SetAndDiscardFramebuffer(m_efb_depth_resolve_framebuffer.get()); g_renderer->SetAndDiscardFramebuffer(m_efb_depth_resolve_framebuffer.get());
g_renderer->SetPipeline(m_efb_depth_resolve_pipeline.get()); g_renderer->SetPipeline(IsEFBMultisampled() ? m_efb_depth_resolve_pipeline.get() :
m_efb_depth_cache.copy_pipeline.get());
g_renderer->SetTexture(0, m_efb_depth_texture.get()); g_renderer->SetTexture(0, m_efb_depth_texture.get());
g_renderer->SetSamplerState(0, RenderState::GetPointSamplerState()); g_renderer->SetSamplerState(0, RenderState::GetPointSamplerState());
g_renderer->SetViewportAndScissor(clamped_region); g_renderer->SetViewportAndScissor(clamped_region);