From 56ebae773c93b4679b1149ceadf268b0ddfdb37e Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Wed, 17 May 2023 18:39:14 +0300
Subject: [PATCH] vk: C++-ify the debug marker sync object member names

---
 rpcs3/Emu/RSX/VK/vkutils/sync.cpp | 16 ++++++++--------
 rpcs3/Emu/RSX/VK/vkutils/sync.h   |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp
index f638b3e68b..5729707ae3 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/sync.cpp
@@ -281,23 +281,23 @@ namespace vk
 	}
 
 	debug_marker_scope::debug_marker_scope(const vk::command_buffer& cmd, const std::string& message)
-		: dev(&cmd.get_command_pool().get_owner()), cb(&cmd), message(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(
-			*dev,
-			*cb,
-			fmt::format("0x%x: Enter %s", rsx::get_shared_tag(), message)
+			*m_device,
+			*m_cb,
+			fmt::format("0x%x: Enter %s", m_tag, m_message)
 		);
 	}
 
 	debug_marker_scope::~debug_marker_scope()
 	{
-		ensure(cb && cb->is_recording());
+		ensure(m_cb && m_cb->is_recording());
 
 		vk::device_debug_marker::insert(
-			*dev,
-			*cb,
-			fmt::format("0x%x: Exit %s", rsx::get_shared_tag(), message)
+			*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 1680cda8ad..49558f2582 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/sync.h
+++ b/rpcs3/Emu/RSX/VK/vkutils/sync.h
@@ -132,9 +132,10 @@ namespace vk
 
 	class debug_marker_scope
 	{
-		const vk::render_device* dev;
-		const vk::command_buffer* cb;
-		std::string message;
+		const vk::render_device* m_device;
+		const vk::command_buffer* m_cb;
+		std::string m_message;
+		u32 m_tag;
 
 	public:
 		debug_marker_scope(const vk::command_buffer& cmd, const std::string& text);