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

Fix init order

This commit is contained in:
kd-11 2023-05-17 19:58:30 +03:00 committed by kd-11
parent 793a21a825
commit 4a138aa918
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpcs3/Emu/RSX/VK/vkutils/sync.cpp
View File

@ -172,11 +172,11 @@ namespace vk
}
}
device_marker_pool::device_marker_pool(const vk::render_device& dev, u32 count)
: pdev(&dev), m_count(count)
gpu_debug_marker_pool::gpu_debug_marker_pool(const vk::render_device& dev, u32 count)
: m_count(count), pdev(&dev)
{}
std::tuple<VkBuffer, u64, volatile u32*> device_marker_pool::allocate()
std::tuple<VkBuffer, u64, volatile u32*> gpu_debug_marker_pool::allocate()
{
if (!m_buffer || m_offset >= m_count)
{
@ -188,7 +188,7 @@ namespace vk
return { m_buffer->value, out_offset * 4, m_mapped + out_offset };
}
void device_marker_pool::create_impl()
void gpu_debug_marker_pool::create_impl()
{
if (m_buffer)
{
@ -211,7 +211,7 @@ namespace vk
m_offset = 0;
}
gpu_debug_marker::gpu_debug_marker(device_marker_pool& pool, std::string message)
gpu_debug_marker::gpu_debug_marker(gpu_debug_marker_pool& pool, std::string message)
: m_device(*pool.pdev), m_message(std::move(message))
{
std::tie(m_buffer, m_buffer_offset, m_value) = pool.allocate();
@ -257,15 +257,15 @@ namespace vk
}
// FIXME
static std::unique_ptr<device_marker_pool> g_device_marker_pool;
static std::unique_ptr<gpu_debug_marker_pool> g_gpu_debug_marker_pool;
device_marker_pool& get_shared_marker_pool(const vk::render_device& dev)
gpu_debug_marker_pool& get_shared_marker_pool(const vk::render_device& dev)
{
if (!g_device_marker_pool)
if (!g_gpu_debug_marker_pool)
{
g_device_marker_pool = std::make_unique<device_marker_pool>(dev, 65536);
g_gpu_debug_marker_pool = std::make_unique<gpu_debug_marker_pool>(dev, 65536);
}
return *g_device_marker_pool;
return *g_gpu_debug_marker_pool;
}
void gpu_debug_marker::insert(

6
rpcs3/Emu/RSX/VK/vkutils/sync.h
View File

@ -87,7 +87,7 @@ namespace vk
operator VkSemaphore() const;
};
class device_marker_pool
class gpu_debug_marker_pool
{
std::unique_ptr<buffer> m_buffer;
volatile u32* m_mapped = nullptr;
@ -97,7 +97,7 @@ namespace vk
void create_impl();
public:
device_marker_pool(const vk::render_device& dev, u32 count);
gpu_debug_marker_pool(const vk::render_device& dev, u32 count);
std::tuple<VkBuffer, u64, volatile u32*> allocate();
const vk::render_device* pdev = nullptr;
@ -114,7 +114,7 @@ namespace vk
volatile u32* m_value = nullptr;
public:
gpu_debug_marker(device_marker_pool& pool, std::string message);
gpu_debug_marker(gpu_debug_marker_pool& pool, std::string message);
~gpu_debug_marker();
gpu_debug_marker(const event&) = delete;