lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-25 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to reset states for images with no memory bound

Browse Source 
* Normally such images wouldn't be in the capture at all since there's no way to
  reference them until after their memory is bound, but with "Ref all resources"
  it's possible.
This commit is contained in:
baldurk
2019-06-04 18:18:10 +01:00
parent bf4ea85470
commit 453c5ea9fc
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_manager.cpp
+8 -2
View File
@@ -294,8 +294,14 @@ void VulkanResourceManager::SerialiseImageStates(SerialiserType &ser,
if(state.newLayout == VK_IMAGE_LAYOUT_UNDEFINED)
state.newLayout = VK_IMAGE_LAYOUT_GENERAL;
t.subresourceRange = state.subresourceRange;
barriers.push_back(t);
vec.push_back(make_rdcpair(liveid, state));
auto stit = states.find(liveid);
if(stit == states.end() || stit->second.memoryBound)
{
barriers.push_back(t);
vec.push_back(make_rdcpair(liveid, state));
}
}
}
renderdoc/driver/vulkan/vk_resources.h
+1
View File
@@ -1330,6 +1330,7 @@ struct ImageLayouts
VkExtent3D extent;
VkFormat format;
VkImageType imageType;
bool memoryBound = false;
};
DECLARE_REFLECTION_STRUCT(ImageLayouts);
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+20
View File
@@ -952,6 +952,8 @@ bool WrappedVulkan::Serialise_vkBindImageMemory(SerialiserType &ser, VkDevice de
ObjDisp(device)->BindImageMemory(Unwrap(device), Unwrap(image), Unwrap(memory), memoryOffset);
m_ImageLayouts[GetResID(image)].memoryBound = true;
GetReplay()->GetResourceDesc(memOrigId).derivedResources.push_back(resOrigId);
GetReplay()->GetResourceDesc(resOrigId).parentResources.push_back(memOrigId);
@@ -984,6 +986,14 @@ VkResult WrappedVulkan::vkBindImageMemory(VkDevice device, VkImage image, VkDevi
chunk = scope.Get();
}
ImageLayouts *layout = NULL;
{
SCOPED_LOCK(m_ImageLayoutsLock);
layout = &m_ImageLayouts[GetResID(image)];
}
layout->memoryBound = true;
// memory object bindings are immutable and must happen before creation or use,
// so this can always go into the record, even if a resource is created and bound
// to memory mid-frame
@@ -2014,6 +2024,8 @@ bool WrappedVulkan::Serialise_vkBindImageMemory2(SerialiserType &ser, VkDevice d
if(!ok)
return false;
m_ImageLayouts[GetResID(bindInfo.image)].memoryBound = true;
GetReplay()->GetResourceDesc(memOrigId).derivedResources.push_back(resOrigId);
GetReplay()->GetResourceDesc(resOrigId).parentResources.push_back(memOrigId);
@@ -2055,6 +2067,14 @@ VkResult WrappedVulkan::vkBindImageMemory2(VkDevice device, uint32_t bindInfoCou
chunk = scope.Get();
}
ImageLayouts *layout = NULL;
{
SCOPED_LOCK(m_ImageLayoutsLock);
layout = &m_ImageLayouts[imgrecord->GetResourceID()];
}
layout->memoryBound = true;
// memory object bindings are immutable and must happen before creation or use,
// so this can always go into the record, even if a resource is created and bound
// to memory mid-frame
renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp
+2
View File
@@ -449,6 +449,7 @@ bool WrappedVulkan::Serialise_vkCreateSwapchainKHR(SerialiserType &ser, VkDevice
m_ImageLayouts[liveId].extent = iminfo.extent;
m_ImageLayouts[liveId].format = iminfo.format;
m_ImageLayouts[liveId].imageType = iminfo.type;
m_ImageLayouts[liveId].memoryBound = true;
m_ImageLayouts[liveId].subresourceStates.clear();
m_ImageLayouts[liveId].subresourceStates.push_back(ImageRegionState(
@@ -586,6 +587,7 @@ void WrappedVulkan::WrapAndProcessCreatedSwapchain(VkDevice device,
SCOPED_LOCK(m_ImageLayoutsLock);
m_ImageLayouts[imid].format = pCreateInfo->imageFormat;
m_ImageLayouts[imid].imageType = VK_IMAGE_TYPE_2D;
m_ImageLayouts[imid].memoryBound = true;
m_ImageLayouts[imid].subresourceStates.clear();
m_ImageLayouts[imid].subresourceStates.push_back(ImageRegionState(