ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4295 from stenzek/vulkan-dbz-bloom 

Vulkan: Fix bug with palette converted EFB copies
This commit is contained in:
Stenzek 2016-10-05 20:24:36 +10:00 committed by GitHub
parent ef1bfc26b2 db09c05eec
commit abb5a64919
3 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/VideoBackends/Vulkan/PaletteTextureConverter.cpp
View File

@ -62,7 +62,9 @@ bool PaletteTextureConverter::Initialize()
return true; return true;
} }
void PaletteTextureConverter::ConvertTexture(StateTracker* state_tracker, VkRenderPass render_pass, void PaletteTextureConverter::ConvertTexture(StateTracker* state_tracker,
VkCommandBuffer command_buffer,
VkRenderPass render_pass,
VkFramebuffer dst_framebuffer, Texture2D* src_texture, VkFramebuffer dst_framebuffer, Texture2D* src_texture,
u32 width, u32 height, void* palette, u32 width, u32 height, void* palette,
TlutFormat format) TlutFormat format)
@ -113,14 +115,14 @@ void PaletteTextureConverter::ConvertTexture(StateTracker* state_tracker, VkRend
&m_palette_buffer_view}; &m_palette_buffer_view};
vkUpdateDescriptorSets(g_vulkan_context->GetDevice(), 1, &texel_set_write, 0, nullptr); vkUpdateDescriptorSets(g_vulkan_context->GetDevice(), 1, &texel_set_write, 0, nullptr);
Util::BufferMemoryBarrier(g_command_buffer_mgr->GetCurrentInitCommandBuffer(), Util::BufferMemoryBarrier(command_buffer, m_palette_stream_buffer->GetBuffer(),
m_palette_stream_buffer->GetBuffer(), VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, palette_offset,
VK_ACCESS_SHADER_READ_BIT, palette_offset, palette_size, palette_size, VK_PIPELINE_STAGE_HOST_BIT,
VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
// Set up draw // Set up draw
UtilityShaderDraw draw(g_command_buffer_mgr->GetCurrentInitCommandBuffer(), m_pipeline_layout, UtilityShaderDraw draw(command_buffer, m_pipeline_layout, render_pass,
render_pass, g_object_cache->GetScreenQuadVertexShader(), VK_NULL_HANDLE, g_object_cache->GetScreenQuadVertexShader(), VK_NULL_HANDLE,
m_shaders[format]); m_shaders[format]);
VkRect2D region = {{0, 0}, {width, height}}; VkRect2D region = {{0, 0}, {width, height}};
@ -138,8 +140,7 @@ void PaletteTextureConverter::ConvertTexture(StateTracker* state_tracker, VkRend
draw.SetPSSampler(0, src_texture->GetView(), g_object_cache->GetPointSampler()); draw.SetPSSampler(0, src_texture->GetView(), g_object_cache->GetPointSampler());
// We have to bind the texel buffer descriptor set separately. // We have to bind the texel buffer descriptor set separately.
vkCmdBindDescriptorSets(g_command_buffer_mgr->GetCurrentInitCommandBuffer(), vkCmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 0, 1,
VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 0, 1,
&texel_buffer_descriptor_set, 0, nullptr); &texel_buffer_descriptor_set, 0, nullptr);
// Draw // Draw

7
Source/Core/VideoBackends/Vulkan/PaletteTextureConverter.h
View File

@ -26,9 +26,10 @@ public:
bool Initialize(); bool Initialize();
void ConvertTexture(StateTracker* state_tracker, VkRenderPass render_pass, void ConvertTexture(StateTracker* state_tracker, VkCommandBuffer command_buffer,
VkFramebuffer dst_framebuffer, Texture2D* src_texture, u32 width, u32 height, VkRenderPass render_pass, VkFramebuffer dst_framebuffer,
void* palette, TlutFormat format); Texture2D* src_texture, u32 width, u32 height, void* palette,
TlutFormat format);
private: private:
static const size_t NUM_PALETTE_CONVERSION_SHADERS = 3; static const size_t NUM_PALETTE_CONVERSION_SHADERS = 3;

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

@ -92,9 +92,26 @@ void TextureCache::ConvertTexture(TCacheEntryBase* base_entry, TCacheEntryBase*
TCacheEntry* unconverted = static_cast<TCacheEntry*>(base_unconverted); TCacheEntry* unconverted = static_cast<TCacheEntry*>(base_unconverted);
_assert_(entry->config.rendertarget); _assert_(entry->config.rendertarget);
// EFB copies can be used as paletted textures as well. For these, we can't assume them to be
// contain the correct data before the frame begins (when the init command buffer is executed),
// so we must convert them at the appropriate time, during the drawing command buffer.
VkCommandBuffer command_buffer;
if (unconverted->IsEfbCopy())
{
command_buffer = g_command_buffer_mgr->GetCurrentCommandBuffer();
m_state_tracker->EndRenderPass();
m_state_tracker->SetPendingRebind();
}
else
{
// Use initialization command buffer and perform conversion before the drawing commands.
command_buffer = g_command_buffer_mgr->GetCurrentInitCommandBuffer();
}
m_palette_texture_converter->ConvertTexture( m_palette_texture_converter->ConvertTexture(
m_state_tracker, GetRenderPassForTextureUpdate(entry->GetTexture()), entry->GetFramebuffer(), m_state_tracker, command_buffer, GetRenderPassForTextureUpdate(entry->GetTexture()),
unconverted->GetTexture(), entry->config.width, entry->config.height, palette, format); entry->GetFramebuffer(), unconverted->GetTexture(), entry->config.width, entry->config.height,
palette, format);
// Render pass transitions to SHADER_READ_ONLY. // Render pass transitions to SHADER_READ_ONLY.
entry->GetTexture()->OverrideImageLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); entry->GetTexture()->OverrideImageLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);