From 495902787c74612c870547c21dbdb61bc53fecf8 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 29 Oct 2015 08:42:30 +0100 Subject: OGL: Remove TCache::Entry usage in TextureConverter --- Source/Core/VideoBackends/OGL/TextureConverter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp') diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index b780594101..ba2046d9a3 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -269,18 +269,18 @@ static void EncodeToRamUsingShader(GLuint srcTexture, } } -void EncodeToRamFromTexture(u8 *dest_ptr, const TextureCache::TCacheEntryBase *texture_entry, +void EncodeToRamFromTexture(u8 *dest_ptr, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, int bScaleByHalf, const EFBRectangle& source) { - SHADER& texconv_shader = GetOrCreateEncodingShader(texture_entry->format); + 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); EncodeToRamUsingShader(source_texture, - dest_ptr, texture_entry->BytesPerRow(), texture_entry->NumBlocksY(), - texture_entry->memory_stride, bScaleByHalf > 0 && !bFromZBuffer); + dest_ptr, bytes_per_row, num_blocks_y, + memory_stride, bScaleByHalf > 0 && !bFromZBuffer); } void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, u32 dstWidth, u32 dstStride, u32 dstHeight) -- cgit v1.2.3 From 71b22702a1b65d024311d6a92069ab76a3b48c96 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 29 Oct 2015 08:45:17 +0100 Subject: OGL-TextureConverter: Keep care about the global state ifself --- Source/Core/VideoBackends/OGL/TextureConverter.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp') diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index ba2046d9a3..bd51ca745f 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -270,17 +270,26 @@ static void EncodeToRamUsingShader(GLuint srcTexture, } void EncodeToRamFromTexture(u8 *dest_ptr, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, - GLuint source_texture, bool bFromZBuffer, bool bIsIntensityFmt, int bScaleByHalf, const EFBRectangle& source) + PEControl::PixelFormat srcFormat, bool bIsIntensityFmt, int bScaleByHalf, const EFBRectangle& source) { + g_renderer->ResetAPIState(); + SHADER& texconv_shader = GetOrCreateEncodingShader(format); texconv_shader.Bind(); glUniform4i(s_encodingUniforms[format], source.left, source.top, native_width, bScaleByHalf ? 2 : 1); - EncodeToRamUsingShader(source_texture, + const GLuint read_texture = (srcFormat == PEControl::Z24) ? + FramebufferManager::ResolveAndGetDepthTarget(source) : + FramebufferManager::ResolveAndGetRenderTarget(source); + + EncodeToRamUsingShader(read_texture, dest_ptr, bytes_per_row, num_blocks_y, - memory_stride, bScaleByHalf > 0 && !bFromZBuffer); + 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) -- cgit v1.2.3 From 087ba5268a5512e95783ad69bc743a5aeb0bb0b9 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 29 Oct 2015 18:08:04 +0100 Subject: TextureCache: Rewrite EFB Copy control flow --- Source/Core/VideoBackends/OGL/TextureConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp') diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index bd51ca745f..b56b08ab4f 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -269,7 +269,7 @@ static void EncodeToRamUsingShader(GLuint srcTexture, } } -void EncodeToRamFromTexture(u8 *dest_ptr, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, +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) { g_renderer->ResetAPIState(); -- cgit v1.2.3