diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-11-07 09:32:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 09:32:37 +0100 |
| commit | dac58a859ca30262b79f72036f1e78ea54be83c4 (patch) | |
| tree | 9567559377284d746b77b07a14a01518017c99d4 /Source/Core/VideoBackends/Vulkan/TextureConverter.cpp | |
| parent | 710b893b914bcc1e812f1a63fdb9a143ff682561 (diff) | |
| parent | a45f977d265bb4360ca0b4a7fd189f4a30362f61 (diff) | |
Merge pull request #7539 from stenzek/batched-efb-copies
TextureCache: Deferred/batched EFB copies
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/TextureConverter.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/TextureConverter.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp b/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp index da40b08667..c5acdc8e7f 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp +++ b/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp @@ -207,10 +207,10 @@ void TextureConverter::ConvertTexture(TextureCacheBase::TCacheEntry* dst_entry, } void TextureConverter::EncodeTextureToMemory( - VkImageView src_texture, u8* dest_ptr, const EFBCopyParams& params, u32 native_width, - u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, const EFBRectangle& src_rect, - bool scale_by_half, float y_scale, float gamma, bool clamp_top, bool clamp_bottom, - const TextureCacheBase::CopyFilterCoefficientArray& filter_coefficients) + VkImageView src_texture, AbstractStagingTexture* dest, const EFBCopyParams& params, + u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, + const EFBRectangle& src_rect, bool scale_by_half, float y_scale, float gamma, bool clamp_top, + bool clamp_bottom, const TextureCacheBase::CopyFilterCoefficientArray& filter_coefficients) { VkShaderModule shader = GetEncodingShader(params); if (shader == VK_NULL_HANDLE) @@ -273,9 +273,7 @@ void TextureConverter::EncodeTextureToMemory( draw.EndRenderPass(); MathUtil::Rectangle<int> copy_rect(0, 0, render_width, render_height); - m_encoding_readback_texture->CopyFromTexture(m_encoding_render_texture.get(), copy_rect, 0, 0, - copy_rect); - m_encoding_readback_texture->ReadTexels(copy_rect, dest_ptr, memory_stride); + dest->CopyFromTexture(m_encoding_render_texture.get(), copy_rect, 0, 0, copy_rect); } bool TextureConverter::SupportsTextureDecoding(TextureFormat format, TLUTFormat palette_format) @@ -610,14 +608,8 @@ VkShaderModule TextureConverter::GetEncodingShader(const EFBCopyParams& params) bool TextureConverter::CreateEncodingTexture() { - TextureConfig config(ENCODING_TEXTURE_WIDTH, ENCODING_TEXTURE_HEIGHT, 1, 1, 1, - ENCODING_TEXTURE_FORMAT, true); - - m_encoding_render_texture = g_renderer->CreateTexture(config); - m_encoding_readback_texture = - g_renderer->CreateStagingTexture(StagingTextureType::Readback, config); - - return m_encoding_render_texture && m_encoding_readback_texture; + m_encoding_render_texture = g_renderer->CreateTexture(TextureCache::GetEncodingTextureConfig()); + return m_encoding_render_texture != nullptr; } bool TextureConverter::CreateDecodingTexture() |
