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

vk: Fix namespace pollution in sync module

Browse source
This commit is contained in:
kd-11 2023-07-01 01:49:32 +03:00 • committed by kd-11
parent fac8bcc20c
commit c818f8af82
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/RSX/VK/vkutils/sync.cpp
View file

@ -2,6 +2,7 @@
#include "buffer_object.h" #include "buffer_object.h"
#include "commands.h" #include "commands.h"
#include "device.h" #include "device.h"
#include "garbage_collector.h"
#include "sync.h" #include "sync.h"
#include "shared.h" #include "shared.h"
@ -10,9 +11,6 @@
#include "util/sysinfo.hpp" #include "util/sysinfo.hpp"
#include "util/asm.hpp" #include "util/asm.hpp"
// FIXME: namespace pollution
#include "../VKResourceManager.h"
namespace vk namespace vk
{ {
namespace globals namespace globals
@ -413,7 +411,7 @@ namespace vk
if (m_buffer) if (m_buffer)
{ {
m_buffer->unmap(); m_buffer->unmap();
vk::get_resource_manager()->dispose(m_buffer); vk::get_gc()->dispose(m_buffer);
} }
m_buffer = std::make_unique<buffer> m_buffer = std::make_unique<buffer>
@ -537,7 +535,7 @@ namespace vk
auto result = std::make_unique<gpu_debug_marker>(globals::get_shared_marker_pool(dev), message); auto result = std::make_unique<gpu_debug_marker>(globals::get_shared_marker_pool(dev), message);
result->signal(cmd, dependency); result->signal(cmd, dependency);
vk::get_resource_manager()->dispose(result); vk::get_gc()->dispose(result);
} }
debug_marker_scope::debug_marker_scope(const vk::command_buffer& cmd, const std::string& message) debug_marker_scope::debug_marker_scope(const vk::command_buffer& cmd, const std::string& message)