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

Track descriptor sets per-cmd-buffer while reading

Browse Source 
* This lets the usage actually have the right descriptor sets to check
  against.
* It was lost as a result of a bad fix after copy-pasting removed the
  previous read-time tracking.
This commit is contained in:
baldurk
2016-07-15 13:24:33 +02:00
parent 3be0d6d1de
commit 48cd7143d7
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+8 -2
View File
@@ -2540,9 +2540,12 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vector<DebugMessa
if(sh.module == ResourceId())
continue;
ResourceId origPipe = GetResourceManager()->GetOriginalID(state.pipeline);
ResourceId origShad = GetResourceManager()->GetOriginalID(sh.module);
// 5 is the compute shader's index (VS, TCS, TES, GS, FS, CS)
const vector<VulkanRenderState::Pipeline::DescriptorAndOffsets> &descSets =
(shad == 5 ? m_RenderState.compute.descSets : m_RenderState.graphics.descSets);
const vector<BakedCmdBufferInfo::CmdBufferState::DescriptorAndOffsets> &descSets =
(shad == 5 ? state.computeDescSets : state.graphicsDescSets);
RDCASSERT(sh.mapping);
@@ -2591,6 +2594,9 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vector<DebugMessa
DescriptorSetInfo &descset = m_DescriptorSetState[descSets[bindset].descSet];
DescSetLayout &layout = c.m_DescSetLayout[descset.layout];
ResourceId origId = GetResourceManager()->GetOriginalID(descSets[bindset].descSet);
ResourceId layoutId = GetResourceManager()->GetOriginalID(descset.layout);
if(layout.bindings.empty())
{
msg.description =
renderdoc/driver/vulkan/vk_core.h
+7
View File
@@ -340,6 +340,13 @@ private:
{
ResourceId pipeline;
struct DescriptorAndOffsets
{
ResourceId descSet;
vector<uint32_t> offsets;
};
vector<DescriptorAndOffsets> graphicsDescSets, computeDescSets;
uint32_t idxWidth;
ResourceId ibuffer;
vector<ResourceId> vbuffers;
renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+4 -3
View File
@@ -1208,9 +1208,10 @@ bool WrappedVulkan::Serialise_vkCmdBindDescriptorSets(
layout = GetResourceManager()->GetLiveHandle<VkPipelineLayout>(layoutid);
// track while reading, as we need to track resource usage
vector<VulkanRenderState::Pipeline::DescriptorAndOffsets> &descsets =
(bind == VK_PIPELINE_BIND_POINT_GRAPHICS) ? m_RenderState.graphics.descSets
: m_RenderState.compute.descSets;
vector<BakedCmdBufferInfo::CmdBufferState::DescriptorAndOffsets> &descsets =
(bind == VK_PIPELINE_BIND_POINT_GRAPHICS)
? m_BakedCmdBufferInfo[m_LastCmdBufferID].state.graphicsDescSets
: m_BakedCmdBufferInfo[m_LastCmdBufferID].state.computeDescSets;
// expand as necessary
if(descsets.size() < first + numSets)