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

Don't load stale/unused descriptor contents in initial contents

Browse Source
This commit is contained in:
baldurk
2019-11-12 09:26:41 +00:00
parent 2f6dc63458
commit 0544c737f7
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_initstate.cpp
+27 -8
View File
@@ -822,10 +822,21 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id,
{
for(uint32_t d = 0; d < descriptorCount; d++)
{
dstImage[d].imageView =
GetResourceManager()->GetLiveHandle<VkImageView>(src[d].imageInfo.imageView);
dstImage[d].sampler =
GetResourceManager()->GetLiveHandle<VkSampler>(src[d].imageInfo.sampler);
if(writes[bind].descriptorType != VK_DESCRIPTOR_TYPE_SAMPLER &&
GetResourceManager()->HasLiveResource(src[d].imageInfo.imageView))
dstImage[d].imageView =
GetResourceManager()->GetLiveHandle<VkImageView>(src[d].imageInfo.imageView);
else
dstImage[d].imageView = VK_NULL_HANDLE;
if((writes[bind].descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER ||
writes[bind].descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) &&
GetResourceManager()->HasLiveResource(src[d].imageInfo.sampler))
dstImage[d].sampler =
GetResourceManager()->GetLiveHandle<VkSampler>(src[d].imageInfo.sampler);
else
dstImage[d].sampler = VK_NULL_HANDLE;
dstImage[d].imageLayout = src[d].imageInfo.imageLayout;
}
@@ -846,8 +857,13 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id,
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
{
for(uint32_t d = 0; d < descriptorCount; d++)
dstTexelBuffer[d] =
GetResourceManager()->GetLiveHandle<VkBufferView>(src[d].texelBufferView);
{
if(GetResourceManager()->HasLiveResource(src[d].texelBufferView))
dstTexelBuffer[d] =
GetResourceManager()->GetLiveHandle<VkBufferView>(src[d].texelBufferView);
else
dstTexelBuffer[d] = VK_NULL_HANDLE;
}
writes[bind].pTexelBufferView = dstTexelBuffer;
// NULL the others
@@ -862,8 +878,11 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id,
{
for(uint32_t d = 0; d < descriptorCount; d++)
{
dstBuffer[d].buffer =
GetResourceManager()->GetLiveHandle<VkBuffer>(src[d].bufferInfo.buffer);
if(GetResourceManager()->HasLiveResource(src[d].bufferInfo.buffer))
dstBuffer[d].buffer =
GetResourceManager()->GetLiveHandle<VkBuffer>(src[d].bufferInfo.buffer);
else
dstBuffer[d].buffer = VK_NULL_HANDLE;
dstBuffer[d].offset = src[d].bufferInfo.offset;
dstBuffer[d].range = src[d].bufferInfo.range;
}