mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-01-15 22:53:47 +00:00
vk: Switch occlusion pool to FIFO rather than LIFO to avoid hard stall
This commit is contained in:
parent
cdd9c12132
commit
55ad9244c0
@ -3745,6 +3745,7 @@ void VKGSRender::get_occlusion_query_result(rsx::reports::occlusion_query_info*
|
|||||||
busy_wait();
|
busy_wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Allocation stack is FIFO and very long so no need to actually wait for fence signal
|
||||||
data.command_buffer_to_wait->flush();
|
data.command_buffer_to_wait->flush();
|
||||||
|
|
||||||
// Gather data
|
// Gather data
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
#include <stack>
|
#include <stack>
|
||||||
|
#include <deque>
|
||||||
|
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
@ -2993,7 +2994,7 @@ public:
|
|||||||
VkQueryPool query_pool = VK_NULL_HANDLE;
|
VkQueryPool query_pool = VK_NULL_HANDLE;
|
||||||
vk::render_device* owner = nullptr;
|
vk::render_device* owner = nullptr;
|
||||||
|
|
||||||
std::stack<u32> available_slots;
|
std::deque<u32> available_slots;
|
||||||
std::vector<bool> query_active_status;
|
std::vector<bool> query_active_status;
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -3031,7 +3032,7 @@ public:
|
|||||||
|
|
||||||
for (u32 n = 0; n < count; ++n)
|
for (u32 n = 0; n < count; ++n)
|
||||||
{
|
{
|
||||||
available_slots.push(n);
|
available_slots.push_back(n);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3102,7 +3103,7 @@ public:
|
|||||||
vkCmdResetQueryPool(cmd, query_pool, index, 1);
|
vkCmdResetQueryPool(cmd, query_pool, index, 1);
|
||||||
|
|
||||||
query_active_status[index] = false;
|
query_active_status[index] = false;
|
||||||
available_slots.push(index);
|
available_slots.push_back(index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3129,8 +3130,8 @@ public:
|
|||||||
return ~0u;
|
return ~0u;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 result = available_slots.top();
|
u32 result = available_slots.front();
|
||||||
available_slots.pop();
|
available_slots.pop_front();
|
||||||
|
|
||||||
verify(HERE), !query_active_status[result];
|
verify(HERE), !query_active_status[result];
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
Reference in New Issue
Block a user