archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

vk: Fix broken layout stream on first draw call

Browse source
This commit is contained in:
kd-11 2019-06-24 13:45:38 +03:00 • committed by kd-11
parent 4ff77a8555
commit 009c55fcba
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llvm

@ -1 +1 @@
Subproject commit 99b5284463025849c59067e79a3c08899049757e Subproject commit b860b5e8f4ee90d6eb567d83ce8ed1a3e71e496f

4
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -1091,7 +1091,6 @@ void VKGSRender::emit_geometry(u32 sub_index)
auto persistent_buffer = m_persistent_attribute_storage ? m_persistent_attribute_storage->value : null_buffer_view->value; auto persistent_buffer = m_persistent_attribute_storage ? m_persistent_attribute_storage->value : null_buffer_view->value;
auto volatile_buffer = m_volatile_attribute_storage ? m_volatile_attribute_storage->value : null_buffer_view->value; auto volatile_buffer = m_volatile_attribute_storage ? m_volatile_attribute_storage->value : null_buffer_view->value;
auto layout_stream = m_vertex_layout_storage ? m_vertex_layout_storage->value : null_buffer_view->value;
bool update_descriptors = false; bool update_descriptors = false;
if (sub_index == 0) if (sub_index == 0)
@ -1134,11 +1133,12 @@ void VKGSRender::emit_geometry(u32 sub_index)
// Update vertex fetch parameters // Update vertex fetch parameters
update_vertex_env(sub_index, upload_info); update_vertex_env(sub_index, upload_info);
verify(HERE), m_vertex_layout_storage;
if (update_descriptors) if (update_descriptors)
{ {
m_program->bind_uniform(persistent_buffer, VERTEX_BUFFERS_FIRST_BIND_SLOT, m_current_frame->descriptor_set); m_program->bind_uniform(persistent_buffer, VERTEX_BUFFERS_FIRST_BIND_SLOT, m_current_frame->descriptor_set);
m_program->bind_uniform(volatile_buffer, VERTEX_BUFFERS_FIRST_BIND_SLOT + 1, m_current_frame->descriptor_set); m_program->bind_uniform(volatile_buffer, VERTEX_BUFFERS_FIRST_BIND_SLOT + 1, m_current_frame->descriptor_set);
m_program->bind_uniform(layout_stream, VERTEX_BUFFERS_FIRST_BIND_SLOT + 2, m_current_frame->descriptor_set); m_program->bind_uniform(m_vertex_layout_storage->value, VERTEX_BUFFERS_FIRST_BIND_SLOT + 2, m_current_frame->descriptor_set);
} }
// Bind the new set of descriptors for use with this draw call // Bind the new set of descriptors for use with this draw call