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

Switch descriptor refs lock back to normal lock

Browse Source 
* Unfortunately some programs have extreme contention on this lock due to
  multithreaded descriptor set writes enabled by UPDATE_AFTER_BIND.
This commit is contained in:
baldurk
2020-09-02 10:22:11 +01:00
parent 55febc88c4
commit 31b81ade3c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_common.cpp
+3 -3
View File
@@ -1060,7 +1060,7 @@ void DescriptorSetSlotImageInfo::SetFrom(const VkDescriptorImageInfo &imInfo, bo
void DescriptorSetSlot::RemoveBindRefs(rdcarray<ResourceId> &ids, VulkanResourceManager *rm,
VkResourceRecord *record)
{
SCOPED_SPINLOCK(record->descInfo->refLock);
SCOPED_LOCK(record->descInfo->refLock);
if(texelBufferView != ResourceId())
{
@@ -1109,7 +1109,7 @@ void DescriptorSetSlot::AddBindRefs(rdcarray<ResourceId> &ids, VkResourceRecord
VkResourceRecord *imgView, VkResourceRecord *buffer,
VkResourceRecord *descSetRecord, FrameRefType ref)
{
SCOPED_SPINLOCK(descSetRecord->descInfo->refLock);
SCOPED_LOCK(descSetRecord->descInfo->refLock);
if(bufView)
{
@@ -1156,7 +1156,7 @@ void DescriptorSetSlot::AddBindRefs(rdcarray<ResourceId> &ids, VulkanResourceMan
void DescriptorSetData::UpdateBackgroundRefCache(const rdcarray<ResourceId> &ids)
{
SCOPED_SPINLOCK(refLock);
SCOPED_LOCK(refLock);
if(backgroundFrameRefs.empty())
{
renderdoc/driver/vulkan/vk_resources.h
+1 -1
View File
@@ -1059,7 +1059,7 @@ struct DescriptorSetData
BindingStorage data;
// lock protecting bindFrameRefs and bindMemRefs
Threading::SpinLock refLock;
Threading::CriticalSection refLock;
// contains the framerefs (ref counted) for the bound resources
// in the binding slots. Updated when updating descriptor sets
renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
+1 -1
View File
@@ -1178,7 +1178,7 @@ void WrappedVulkan::vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount,
VkResourceRecord *setrecord = GetRecord(pDescriptorCopies[i].srcSet);
SCOPED_SPINLOCK(setrecord->descInfo->refLock);
SCOPED_LOCK(setrecord->descInfo->refLock);
for(auto refit = setrecord->descInfo->bindFrameRefs.begin();
refit != setrecord->descInfo->bindFrameRefs.end(); ++refit)
renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+2 -2
View File
@@ -877,7 +877,7 @@ VkResult WrappedVulkan::vkQueueSubmit(VkQueue queue, uint32_t submitCount,
VkResourceRecord *setrecord = GetRecord(*it);
SCOPED_SPINLOCK(setrecord->descInfo->refLock);
SCOPED_LOCK(setrecord->descInfo->refLock);
for(auto refit = setrecord->descInfo->bindFrameRefs.begin();
refit != setrecord->descInfo->bindFrameRefs.end(); ++refit)
@@ -965,7 +965,7 @@ VkResult WrappedVulkan::vkQueueSubmit(VkQueue queue, uint32_t submitCount,
{
VkResourceRecord *setrecord = GetRecord(*it);
SCOPED_SPINLOCK(setrecord->descInfo->refLock);
SCOPED_LOCK(setrecord->descInfo->refLock);
GetResourceManager()->MarkBackgroundFrameReferenced(
setrecord->descInfo->backgroundFrameRefs);