diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-11-16 00:13:42 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-11-16 00:13:42 +1300 |
| commit | 18afbe64905f87c58f25f1da75ecc8e7e6f4b07e (patch) | |
| tree | ba5beb146187c96b8030bdfb0a3292dcbe0a0276 /Source/Core/VideoBackends/OGL/TextureConverter.cpp | |
| parent | 3df344ed38d67759d10c962841fb04389998a1b8 (diff) | |
| parent | 087ba5268a5512e95783ad69bc743a5aeb0bb0b9 (diff) | |
Merge pull request #3210 from degasus/efbcopy
TextureCache: Efb Copy Separation
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureConverter.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index b780594101..b56b08ab4f 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -269,18 +269,27 @@ static void EncodeToRamUsingShader(GLuint srcTexture, } } -void EncodeToRamFromTexture(u8 *dest_ptr, const TextureCache::TCacheEntryBase *texture_entry, - GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, int bScaleByHalf, const EFBRectangle& source) +void EncodeToRamFromTexture(u8* dest_ptr, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, + PEControl::PixelFormat srcFormat, bool bIsIntensityFmt, int bScaleByHalf, const EFBRectangle& source) { - SHADER& texconv_shader = GetOrCreateEncodingShader(texture_entry->format); + g_renderer->ResetAPIState(); + + SHADER& texconv_shader = GetOrCreateEncodingShader(format); texconv_shader.Bind(); - glUniform4i(s_encodingUniforms[texture_entry->format], - source.left, source.top, texture_entry->native_width, bScaleByHalf ? 2 : 1); + 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); - EncodeToRamUsingShader(source_texture, - dest_ptr, texture_entry->BytesPerRow(), texture_entry->NumBlocksY(), - texture_entry->memory_stride, bScaleByHalf > 0 && !bFromZBuffer); + EncodeToRamUsingShader(read_texture, + dest_ptr, bytes_per_row, num_blocks_y, + memory_stride, bScaleByHalf > 0 && srcFormat != PEControl::Z24); + + FramebufferManager::SetFramebuffer(0); + g_renderer->RestoreAPIState(); } void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, u32 dstWidth, u32 dstStride, u32 dstHeight) |
