diff options
| author | Stenzek <stenzek@gmail.com> | 2020-05-24 16:11:10 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2020-05-24 16:11:11 +1000 |
| commit | bf74553878ee4495b684fecb80ca31a567e79c63 (patch) | |
| tree | cabefd405b53d973e3f6391429da11bda4a6c768 /Source/Core/VideoCommon | |
| parent | 393ce529af87b1b11877eb6e376c54592f4160ee (diff) | |
FramebufferManager: Copy to color format for depth readbacks on GLES
glReadPixels() with depth formats is not supported.
Should fix broken EFB access on GLES.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/FramebufferManager.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoConfig.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/FramebufferManager.cpp b/Source/Core/VideoCommon/FramebufferManager.cpp index de3ca7457d..0aeb691362 100644 --- a/Source/Core/VideoCommon/FramebufferManager.cpp +++ b/Source/Core/VideoCommon/FramebufferManager.cpp @@ -513,7 +513,8 @@ bool FramebufferManager::CreateReadbackFramebuffer() // Since we can't partially copy from a depth buffer directly to the staging texture in D3D, we // use an intermediate buffer to avoid copying the whole texture. - if ((IsUsingTiledEFBCache() && !g_ActiveConfig.backend_info.bSupportsPartialDepthCopies) || + if (!g_ActiveConfig.backend_info.bSupportsDepthReadback || + (IsUsingTiledEFBCache() && !g_ActiveConfig.backend_info.bSupportsPartialDepthCopies) || !AbstractTexture::IsCompatibleDepthAndColorFormats(m_efb_depth_texture->GetFormat(), GetEFBDepthCopyFormat()) || g_renderer->GetEFBScale() != 1) @@ -577,7 +578,8 @@ void FramebufferManager::PopulateEFBCache(bool depth, u32 tile_index) // buffer directly to a staging texture (must be the whole resource). const bool force_intermediate_copy = depth && - ((!g_ActiveConfig.backend_info.bSupportsPartialDepthCopies && IsUsingTiledEFBCache()) || + (!g_ActiveConfig.backend_info.bSupportsDepthReadback || + (!g_ActiveConfig.backend_info.bSupportsPartialDepthCopies && IsUsingTiledEFBCache()) || !AbstractTexture::IsCompatibleDepthAndColorFormats(m_efb_depth_texture->GetFormat(), GetEFBDepthCopyFormat())); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 41dc891e8a..ee0951180a 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -229,6 +229,7 @@ struct VideoConfig final bool bSupportsBackgroundCompiling; bool bSupportsLargePoints; bool bSupportsPartialDepthCopies; + bool bSupportsDepthReadback; bool bSupportsShaderBinaries; bool bSupportsPipelineCacheData; } backend_info; |
