lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race in memory reference tracking

Browse Source
This commit is contained in:
Benson Joeris
2019-03-08 16:52:03 -05:00
committed by Baldur Karlsson
parent a31e6335e5
commit 4ed48c9bf4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_manager.cpp
+6
View File
@@ -680,6 +680,8 @@ ResourceId VulkanResourceManager::GetFirstIDForHandle(uint64_t handle)
void VulkanResourceManager::MarkMemoryFrameReferenced(ResourceId mem, VkDeviceSize offset,
VkDeviceSize size, FrameRefType refType)
{
SCOPED_LOCK(m_Lock);
FrameRefType maxRef = MarkMemoryReferenced(m_MemFrameRefs, mem, offset, size, refType);
MarkResourceFrameReferenced(
mem, maxRef, [](FrameRefType x, FrameRefType y) -> FrameRefType { return std::max(x, y); });
@@ -687,6 +689,8 @@ void VulkanResourceManager::MarkMemoryFrameReferenced(ResourceId mem, VkDeviceSi
void VulkanResourceManager::MergeReferencedMemory(std::map<ResourceId, MemRefs> &memRefs)
{
SCOPED_LOCK(m_Lock);
for(auto j = memRefs.begin(); j != memRefs.end(); j++)
{
auto i = m_MemFrameRefs.find(j->first);
@@ -699,6 +703,8 @@ void VulkanResourceManager::MergeReferencedMemory(std::map<ResourceId, MemRefs>
void VulkanResourceManager::ClearReferencedMemory()
{
SCOPED_LOCK(m_Lock);
m_MemFrameRefs.clear();
}