From 5046cbd015de1dc081d7cbae0698468e8d516398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 20 Aug 2022 17:23:51 +0200 Subject: [PATCH] Address feedback to PR #15858 --- GPU/Common/FramebufferManagerCommon.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index 308f1b7fd5..a1164c686f 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -537,7 +537,6 @@ void FramebufferManagerCommon::CopyToDepthFromOverlappingFramebuffers(VirtualFra sources.push_back(CopySource{ src, RASTER_COLOR }); } } else if (src->z_address == dest->z_address && src->z_stride == dest->z_stride && src->depthBindSeq > dest->depthBindSeq) { - // Don't bother if the buffer was from another frame. This heuristic is old. sources.push_back(CopySource{ src, RASTER_DEPTH }); } else { // TODO: Do more detailed overlap checks here. @@ -562,6 +561,9 @@ void FramebufferManagerCommon::CopyToDepthFromOverlappingFramebuffers(VirtualFra } else if (source.channel == RASTER_COLOR) { VirtualFramebuffer *src = source.vfb; // Copying color to depth. + if (src->drawnFormat != GE_FORMAT_565) { + WARN_LOG_ONCE(not565, G3D, "Drawn format of buffer at %08x not 565 as expected", src->fb_address); + } BlitUsingRaster(src->fbo, 0.0f, 0.0f, src->renderWidth, src->renderHeight, dest->fbo, 0.0f, 0.0f, dest->renderWidth, dest->renderHeight, false, DRAW2D_565_TO_DEPTH, "565_to_depth"); } }