From 6fd76054b4358c48f963c30fd9478b5219d4ad84 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 17 May 2023 18:41:36 +0300 Subject: [PATCH] vk: Rename the debug marker to something more appropriate --- rpcs3/Emu/RSX/VK/VKResourceManager.h | 8 ++++---- rpcs3/Emu/RSX/VK/vkutils/sync.cpp | 18 +++++++++--------- rpcs3/Emu/RSX/VK/vkutils/sync.h | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.h b/rpcs3/Emu/RSX/VK/VKResourceManager.h index ac0280ba0d..39bdb35d87 100644 --- a/rpcs3/Emu/RSX/VK/VKResourceManager.h +++ b/rpcs3/Emu/RSX/VK/VKResourceManager.h @@ -57,7 +57,7 @@ namespace vk u64 eid; const vk::render_device* m_device; std::vector m_disposables; - std::vector> m_debug_markers; + std::vector> m_debug_markers; eid_scope_t(u64 _eid): eid(_eid), m_device(g_render_device) @@ -190,7 +190,7 @@ namespace vk get_current_eid_scope().m_disposables.emplace_back(std::move(disposable)); } - inline void dispose(std::unique_ptr& object) + inline void dispose(std::unique_ptr& object) { // Special case as we may need to read these out. // FIXME: We can manage these markers better and remove this exception. @@ -232,9 +232,9 @@ namespace vk void trim(); - std::vector gather_debug_markers() const + std::vector gather_debug_markers() const { - std::vector result; + std::vector result; for (const auto& scope : m_eid_map) { for (const auto& item : scope.m_debug_markers) diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp index 5729707ae3..a85b97adde 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp @@ -211,14 +211,14 @@ namespace vk m_offset = 0; } - device_debug_marker::device_debug_marker(device_marker_pool& pool, std::string message) + gpu_debug_marker::gpu_debug_marker(device_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(); *m_value = 0xCAFEBABE; } - device_debug_marker::~device_debug_marker() + gpu_debug_marker::~gpu_debug_marker() { if (!m_printed) { @@ -228,13 +228,13 @@ namespace vk m_value = nullptr; } - void device_debug_marker::signal(const command_buffer& cmd, VkPipelineStageFlags stages, VkAccessFlags access) + void gpu_debug_marker::signal(const command_buffer& cmd, VkPipelineStageFlags stages, VkAccessFlags access) { insert_global_memory_barrier(cmd, stages, VK_PIPELINE_STAGE_TRANSFER_BIT, access, VK_ACCESS_TRANSFER_WRITE_BIT); vkCmdFillBuffer(cmd, m_buffer, m_buffer_offset, 4, 0xDEADBEEF); } - void device_debug_marker::dump() + void gpu_debug_marker::dump() { if (*m_value == 0xCAFEBABE) { @@ -244,7 +244,7 @@ namespace vk m_printed = true; } - void device_debug_marker::dump() const + void gpu_debug_marker::dump() const { if (*m_value == 0xCAFEBABE) { @@ -268,14 +268,14 @@ namespace vk return *g_device_marker_pool; } - void device_debug_marker::insert( + void gpu_debug_marker::insert( const vk::render_device& dev, const vk::command_buffer& cmd, std::string message, VkPipelineStageFlags stages, VkAccessFlags access) { - auto result = std::make_unique(get_shared_marker_pool(dev), message); + auto result = std::make_unique(get_shared_marker_pool(dev), message); result->signal(cmd, stages, access); vk::get_resource_manager()->dispose(result); } @@ -283,7 +283,7 @@ namespace vk debug_marker_scope::debug_marker_scope(const vk::command_buffer& cmd, const std::string& message) : m_device(&cmd.get_command_pool().get_owner()), m_cb(&cmd), m_message(message), m_tag(rsx::get_shared_tag()) { - vk::device_debug_marker::insert( + vk::gpu_debug_marker::insert( *m_device, *m_cb, fmt::format("0x%x: Enter %s", m_tag, m_message) @@ -294,7 +294,7 @@ namespace vk { ensure(m_cb && m_cb->is_recording()); - vk::device_debug_marker::insert( + vk::gpu_debug_marker::insert( *m_device, *m_cb, fmt::format("0x%x: Exit %s", m_tag, m_message) diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.h b/rpcs3/Emu/RSX/VK/vkutils/sync.h index 49558f2582..17c4e612e4 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/sync.h +++ b/rpcs3/Emu/RSX/VK/vkutils/sync.h @@ -103,7 +103,7 @@ namespace vk const vk::render_device* pdev = nullptr; }; - class device_debug_marker + class gpu_debug_marker { std::string m_message; bool m_printed = false; @@ -114,9 +114,9 @@ namespace vk volatile u32* m_value = nullptr; public: - device_debug_marker(device_marker_pool& pool, std::string message); - ~device_debug_marker(); - device_debug_marker(const event&) = delete; + gpu_debug_marker(device_marker_pool& pool, std::string message); + ~gpu_debug_marker(); + gpu_debug_marker(const event&) = delete; void signal(const command_buffer& cmd, VkPipelineStageFlags stages, VkAccessFlags access); void dump();