Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU/Vulkan: Fix UBO hazard across cmdbuffers

Browse source
This commit is contained in:
Connor McLaughlin 2021-03-14 01:53:17 +10:00
parent 05f6f8579f
commit c062cc2c26
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/core/gpu_hw_vulkan.cpp
View file

@ -174,10 +174,15 @@ void GPU_HW_Vulkan::ResetGraphicsAPIState()
EndRenderPass(); EndRenderPass();
if (m_host_display->GetDisplayTextureHandle() == &m_vram_texture) if (m_host_display->GetDisplayTextureHandle() == &m_vram_texture)
{
m_vram_texture.TransitionToLayout(g_vulkan_context->GetCurrentCommandBuffer(), m_vram_texture.TransitionToLayout(g_vulkan_context->GetCurrentCommandBuffer(),
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
} }
// this is called at the end of the frame, so the UBO is associated with the previous command buffer.
m_batch_ubo_dirty = true;
}
void GPU_HW_Vulkan::RestoreGraphicsAPIState() void GPU_HW_Vulkan::RestoreGraphicsAPIState()
{ {
VkCommandBuffer cmdbuf = g_vulkan_context->GetCurrentCommandBuffer(); VkCommandBuffer cmdbuf = g_vulkan_context->GetCurrentCommandBuffer();
@ -238,9 +243,7 @@ void GPU_HW_Vulkan::MapBatchVertexPointer(u32 required_vertices)
if (!m_vertex_stream_buffer.ReserveMemory(required_space, sizeof(BatchVertex))) if (!m_vertex_stream_buffer.ReserveMemory(required_space, sizeof(BatchVertex)))
{ {
Log_PerfPrintf("Executing command buffer while waiting for %u bytes in vertex stream buffer", required_space); Log_PerfPrintf("Executing command buffer while waiting for %u bytes in vertex stream buffer", required_space);
EndRenderPass(); ExecuteCommandBuffer(false, true);
g_vulkan_context->ExecuteCommandBuffer(false);
RestoreGraphicsAPIState();
if (!m_vertex_stream_buffer.ReserveMemory(required_space, sizeof(BatchVertex))) if (!m_vertex_stream_buffer.ReserveMemory(required_space, sizeof(BatchVertex)))
Panic("Failed to reserve vertex stream buffer memory"); Panic("Failed to reserve vertex stream buffer memory");
} }
@ -268,9 +271,7 @@ void GPU_HW_Vulkan::UploadUniformBuffer(const void* data, u32 data_size)
if (!m_uniform_stream_buffer.ReserveMemory(data_size, alignment)) if (!m_uniform_stream_buffer.ReserveMemory(data_size, alignment))
{ {
Log_PerfPrintf("Executing command buffer while waiting for %u bytes in uniform stream buffer", data_size); Log_PerfPrintf("Executing command buffer while waiting for %u bytes in uniform stream buffer", data_size);
EndRenderPass(); ExecuteCommandBuffer(false, true);
g_vulkan_context->ExecuteCommandBuffer(false);
RestoreGraphicsAPIState();
if (!m_uniform_stream_buffer.ReserveMemory(data_size, alignment)) if (!m_uniform_stream_buffer.ReserveMemory(data_size, alignment))
Panic("Failed to reserve uniform stream buffer memory"); Panic("Failed to reserve uniform stream buffer memory");
} }
@ -405,6 +406,15 @@ void GPU_HW_Vulkan::EndRenderPass()
m_current_render_pass = VK_NULL_HANDLE; m_current_render_pass = VK_NULL_HANDLE;
} }
void GPU_HW_Vulkan::ExecuteCommandBuffer(bool wait_for_completion, bool restore_state)
{
EndRenderPass();
g_vulkan_context->ExecuteCommandBuffer(wait_for_completion);
m_batch_ubo_dirty = true;
if (restore_state)
RestoreGraphicsAPIState();
}
bool GPU_HW_Vulkan::CreatePipelineLayouts() bool GPU_HW_Vulkan::CreatePipelineLayouts()
{ {
VkDevice device = g_vulkan_context->GetDevice(); VkDevice device = g_vulkan_context->GetDevice();
@ -1459,11 +1469,10 @@ void GPU_HW_Vulkan::ReadVRAM(u32 x, u32 y, u32 width, u32 height)
encoded_height); encoded_height);
// And copy it into our shadow buffer (will execute command buffer and stall). // And copy it into our shadow buffer (will execute command buffer and stall).
ExecuteCommandBuffer(true, true);
m_vram_readback_staging_texture.ReadTexels(0, 0, encoded_width, encoded_height, m_vram_readback_staging_texture.ReadTexels(0, 0, encoded_width, encoded_height,
&m_vram_shadow[copy_rect.top * VRAM_WIDTH + copy_rect.left], &m_vram_shadow[copy_rect.top * VRAM_WIDTH + copy_rect.left],
VRAM_WIDTH * sizeof(u16)); VRAM_WIDTH * sizeof(u16));
RestoreGraphicsAPIState();
} }
void GPU_HW_Vulkan::FillVRAM(u32 x, u32 y, u32 width, u32 height, u32 color) void GPU_HW_Vulkan::FillVRAM(u32 x, u32 y, u32 width, u32 height, u32 color)
@ -1521,9 +1530,7 @@ void GPU_HW_Vulkan::UpdateVRAM(u32 x, u32 y, u32 width, u32 height, const void*
if (!m_texture_stream_buffer.ReserveMemory(data_size, alignment)) if (!m_texture_stream_buffer.ReserveMemory(data_size, alignment))
{ {
Log_PerfPrintf("Executing command buffer while waiting for %u bytes in stream buffer", data_size); Log_PerfPrintf("Executing command buffer while waiting for %u bytes in stream buffer", data_size);
EndRenderPass(); ExecuteCommandBuffer(false, true);
g_vulkan_context->ExecuteCommandBuffer(false);
RestoreGraphicsAPIState();
if (!m_texture_stream_buffer.ReserveMemory(data_size, alignment)) if (!m_texture_stream_buffer.ReserveMemory(data_size, alignment))
{ {
Panic("Failed to allocate space in stream buffer for VRAM write"); Panic("Failed to allocate space in stream buffer for VRAM write");
@ -1731,7 +1738,7 @@ bool GPU_HW_Vulkan::BlitVRAMReplacementTexture(const TextureReplacementTexture*
if (!m_texture_replacment_stream_buffer.ReserveMemory(required_size, alignment)) if (!m_texture_replacment_stream_buffer.ReserveMemory(required_size, alignment))
{ {
Log_PerfPrint("Executing command buffer while waiting for texture replacement buffer space"); Log_PerfPrint("Executing command buffer while waiting for texture replacement buffer space");
g_vulkan_context->ExecuteCommandBuffer(false); ExecuteCommandBuffer(false, true);
if (!m_texture_replacment_stream_buffer.ReserveMemory(required_size, alignment)) if (!m_texture_replacment_stream_buffer.ReserveMemory(required_size, alignment))
{ {
Log_ErrorPrintf("Failed to allocate %u bytes from texture replacement streaming buffer", required_size); Log_ErrorPrintf("Failed to allocate %u bytes from texture replacement streaming buffer", required_size);

1
src/core/gpu_hw_vulkan.h
View file

@ -53,6 +53,7 @@ private:
const VkClearValue* clear_value = nullptr); const VkClearValue* clear_value = nullptr);
void BeginVRAMRenderPass(); void BeginVRAMRenderPass();
void EndRenderPass(); void EndRenderPass();
void ExecuteCommandBuffer(bool wait_for_completion, bool restore_state);
bool CreatePipelineLayouts(); bool CreatePipelineLayouts();
bool CreateSamplers(); bool CreateSamplers();