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

GS/Vulkan: Fix redundant constant buffer reuploads 

Also the redundant descriptor set binds.
This commit is contained in:
Connor McLaughlin 2022-09-23 23:04:53 +10:00 committed by refractionpcsx2
parent 000de4c72e
commit bf8d3a044f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS/Renderers/DX12/GSDevice12.cpp
View File

@ -2180,7 +2180,7 @@ bool GSDevice12::ApplyTFXState(bool already_execed)
return true; return true;
u32 flags = m_dirty_flags; u32 flags = m_dirty_flags;
m_dirty_flags &= ~DIRTY_TFX_STATE | DIRTY_CONSTANT_BUFFER_STATE; m_dirty_flags &= ~(DIRTY_TFX_STATE | DIRTY_CONSTANT_BUFFER_STATE);
// do cbuffer first, because it's the most likely to cause an exec // do cbuffer first, because it's the most likely to cause an exec
if (flags & DIRTY_FLAG_VS_CONSTANT_BUFFER) if (flags & DIRTY_FLAG_VS_CONSTANT_BUFFER)

4
pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp
View File

@ -2527,7 +2527,7 @@ bool GSDeviceVK::ApplyTFXState(bool already_execed)
const VkDevice dev = g_vulkan_context->GetDevice(); const VkDevice dev = g_vulkan_context->GetDevice();
const VkCommandBuffer cmdbuf = g_vulkan_context->GetCurrentCommandBuffer(); const VkCommandBuffer cmdbuf = g_vulkan_context->GetCurrentCommandBuffer();
u32 flags = m_dirty_flags; u32 flags = m_dirty_flags;
m_dirty_flags &= ~DIRTY_TFX_STATE | DIRTY_CONSTANT_BUFFER_STATE; m_dirty_flags &= ~(DIRTY_TFX_STATE | DIRTY_CONSTANT_BUFFER_STATE | DIRTY_FLAG_TFX_DYNAMIC_OFFSETS);
// do cbuffer first, because it's the most likely to cause an exec // do cbuffer first, because it's the most likely to cause an exec
if (flags & DIRTY_FLAG_VS_CONSTANT_BUFFER) if (flags & DIRTY_FLAG_VS_CONSTANT_BUFFER)
@ -2548,6 +2548,7 @@ bool GSDeviceVK::ApplyTFXState(bool already_execed)
std::memcpy(m_vertex_uniform_stream_buffer.GetCurrentHostPointer(), &m_vs_cb_cache, sizeof(m_vs_cb_cache)); std::memcpy(m_vertex_uniform_stream_buffer.GetCurrentHostPointer(), &m_vs_cb_cache, sizeof(m_vs_cb_cache));
m_tfx_dynamic_offsets[0] = m_vertex_uniform_stream_buffer.GetCurrentOffset(); m_tfx_dynamic_offsets[0] = m_vertex_uniform_stream_buffer.GetCurrentOffset();
m_vertex_uniform_stream_buffer.CommitMemory(sizeof(m_vs_cb_cache)); m_vertex_uniform_stream_buffer.CommitMemory(sizeof(m_vs_cb_cache));
flags |= DIRTY_FLAG_TFX_DYNAMIC_OFFSETS;
} }
if (flags & DIRTY_FLAG_PS_CONSTANT_BUFFER) if (flags & DIRTY_FLAG_PS_CONSTANT_BUFFER)
@ -2568,6 +2569,7 @@ bool GSDeviceVK::ApplyTFXState(bool already_execed)
std::memcpy(m_fragment_uniform_stream_buffer.GetCurrentHostPointer(), &m_ps_cb_cache, sizeof(m_ps_cb_cache)); std::memcpy(m_fragment_uniform_stream_buffer.GetCurrentHostPointer(), &m_ps_cb_cache, sizeof(m_ps_cb_cache));
m_tfx_dynamic_offsets[1] = m_fragment_uniform_stream_buffer.GetCurrentOffset(); m_tfx_dynamic_offsets[1] = m_fragment_uniform_stream_buffer.GetCurrentOffset();
m_fragment_uniform_stream_buffer.CommitMemory(sizeof(m_ps_cb_cache)); m_fragment_uniform_stream_buffer.CommitMemory(sizeof(m_ps_cb_cache));
flags |= DIRTY_FLAG_TFX_DYNAMIC_OFFSETS;
} }
Vulkan::DescriptorSetUpdateBuilder dsub; Vulkan::DescriptorSetUpdateBuilder dsub;