The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 23:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5605 from stenzek/vulkan-imagelayout-assert

Browse Source 
Vulkan: Fix image layout assertion failing for palette textures
This commit is contained in:
shuffle2 2017-06-12 22:15:12 -07:00 committed by GitHub
commit 77c0539b5e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoBackends/Vulkan/TextureCache.cpp
View File

@ -87,6 +87,12 @@ void TextureCache::ConvertTexture(TCacheEntryBase* base_entry, TCacheEntryBase*
TCacheEntry* unconverted = static_cast<TCacheEntry*>(base_unconverted); TCacheEntry* unconverted = static_cast<TCacheEntry*>(base_unconverted);
m_texture_converter->ConvertTexture(entry, unconverted, m_render_pass, palette, format); m_texture_converter->ConvertTexture(entry, unconverted, m_render_pass, palette, format);
// Ensure both textures remain in the SHADER_READ_ONLY layout so they can be bound.
unconverted->GetTexture()->TransitionToLayout(g_command_buffer_mgr->GetCurrentCommandBuffer(),
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
entry->GetTexture()->TransitionToLayout(g_command_buffer_mgr->GetCurrentCommandBuffer(),
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
} }
void TextureCache::CopyEFB(u8* dst, const EFBCopyFormat& format, u32 native_width, void TextureCache::CopyEFB(u8* dst, const EFBCopyFormat& format, u32 native_width,
@ -140,6 +146,12 @@ void TextureCache::CopyRectangleFromTexture(TCacheEntry* dst_texture,
CopyTextureRectangle(dst_texture, dst_rect, src_texture, src_rect); CopyTextureRectangle(dst_texture, dst_rect, src_texture, src_rect);
else else
ScaleTextureRectangle(dst_texture, dst_rect, src_texture, src_rect); ScaleTextureRectangle(dst_texture, dst_rect, src_texture, src_rect);
// Ensure both textures remain in the SHADER_READ_ONLY layout so they can be bound.
src_texture->TransitionToLayout(g_command_buffer_mgr->GetCurrentCommandBuffer(),
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
dst_texture->GetTexture()->TransitionToLayout(g_command_buffer_mgr->GetCurrentCommandBuffer(),
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
} }
bool TextureCache::SupportsGPUTextureDecode(TextureFormat format, TlutFormat palette_format) bool TextureCache::SupportsGPUTextureDecode(TextureFormat format, TlutFormat palette_format)