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

Add new common pipeline state accessors for descriptor-based accesses

Browse Source 
* These are temporarily given separate names, to allow them to exist in parallel
  with the existing helpers, but in future these will be renamed when the older
  helpers are removed.
This commit is contained in:
baldurk
2024-04-10 18:58:51 +01:00
parent bbbfb5f3d2
commit 2a41eb54dd
7 changed files with 560 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/replay/replay_controller.cpp
+49 -2
View File
@@ -131,11 +131,11 @@ rdcarray<Descriptor> ReplayController::GetDescriptors(ResourceId descriptorStore
return m_pDevice->GetDescriptors(m_pDevice->GetLiveID(descriptorStore), ranges);
}
rdcarray<DescriptorAccess> ReplayController::GetDescriptorAccess()
const rdcarray<DescriptorAccess> &ReplayController::GetDescriptorAccess()
{
CHECK_REPLAY_THREAD();
return m_pDevice->GetDescriptorAccess(m_EventID);
return m_PipeState.GetDescriptorAccess();
}
rdcarray<DescriptorLogicalLocation> ReplayController::GetDescriptorLocations(
@@ -2257,4 +2257,51 @@ void ReplayController::FetchPipelineState(uint32_t eventId)
m_PipeState.SetState(&m_GLPipelineState);
else if(m_APIProps.pipelineType == GraphicsAPI::Vulkan)
m_PipeState.SetState(&m_VulkanPipelineState);
rdcarray<DescriptorAccess> access = m_pDevice->GetDescriptorAccess(eventId);
rdcarray<Descriptor> descs;
rdcarray<SamplerDescriptor> samps;
descs.reserve(access.size());
samps.reserve(access.size());
// we could collate ranges by descriptor store, but in practice we don't expect descriptors to be
// scattered across multiple stores. So to keep the code simple for now we do a linear sweep
ResourceId store;
rdcarray<DescriptorRange> ranges;
for(const DescriptorAccess &acc : access)
{
if(acc.descriptorStore != store)
{
if(store != ResourceId())
{
descs.append(m_pDevice->GetDescriptors(store, ranges));
samps.append(m_pDevice->GetSamplerDescriptors(store, ranges));
}
store = m_pDevice->GetLiveID(acc.descriptorStore);
ranges.clear();
}
// if the last range is contiguous with this access, append this access as a new range to query
if(!ranges.empty() && ranges.back().descriptorSize == acc.byteSize &&
ranges.back().offset + ranges.back().descriptorSize == acc.byteOffset)
{
ranges.back().count++;
continue;
}
DescriptorRange range;
range.offset = acc.byteOffset;
range.descriptorSize = acc.byteSize;
ranges.push_back(range);
}
if(store != ResourceId())
{
descs.append(m_pDevice->GetDescriptors(store, ranges));
samps.append(m_pDevice->GetSamplerDescriptors(store, ranges));
}
m_PipeState.SetDescriptorAccess(std::move(access), std::move(descs), std::move(samps));
}
renderdoc/replay/replay_controller.h
+1 -1
View File
@@ -154,7 +154,7 @@ public:
const rdcarray<DescriptorRange> &ranges);
rdcarray<SamplerDescriptor> GetSamplerDescriptors(ResourceId descriptorStore,
const rdcarray<DescriptorRange> &ranges);
rdcarray<DescriptorAccess> GetDescriptorAccess();
const rdcarray<DescriptorAccess> &GetDescriptorAccess();
rdcarray<DescriptorLogicalLocation> GetDescriptorLocations(ResourceId descriptorStore,
const rdcarray<DescriptorRange> &ranges);