Merge pull request #4569 from degasus/texcache2

TextureCache: Extract BP enum check to VideoCommon.

1 files changed, 4 insertions, 5 deletions

diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
index d1d4ae5477..3288aedfb0 100644
--- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
@@ -270,7 +270,7 @@ static void EncodeToRamUsingShader(GLuint srcTexture, u8* destAddr, u32 dst_line
 }
 
 void EncodeToRamFromTexture(u8* dest_ptr, u32 format, u32 native_width, u32 bytes_per_row,
-                            u32 num_blocks_y, u32 memory_stride, PEControl::PixelFormat srcFormat,
+                            u32 num_blocks_y, u32 memory_stride, bool is_depth_copy,
                             bool bIsIntensityFmt, int bScaleByHalf, const EFBRectangle& source)
 {
   g_renderer->ResetAPIState();
@@ -281,12 +281,11 @@ void EncodeToRamFromTexture(u8* dest_ptr, u32 format, u32 native_width, u32 byte
   glUniform4i(s_encodingUniforms[format], source.left, source.top, native_width,
               bScaleByHalf ? 2 : 1);
 
-  const GLuint read_texture = (srcFormat == PEControl::Z24) ?
-                                  FramebufferManager::ResolveAndGetDepthTarget(source) :
-                                  FramebufferManager::ResolveAndGetRenderTarget(source);
+  const GLuint read_texture = is_depth_copy ? FramebufferManager::ResolveAndGetDepthTarget(source) :
+                                              FramebufferManager::ResolveAndGetRenderTarget(source);
 
   EncodeToRamUsingShader(read_texture, dest_ptr, bytes_per_row, num_blocks_y, memory_stride,
-                         bScaleByHalf > 0 && srcFormat != PEControl::Z24);
+                         bScaleByHalf > 0 && !is_depth_copy);
 
   FramebufferManager::SetFramebuffer(0);
   g_renderer->RestoreAPIState();