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

Add implicit resolve usage for renderpasses

Browse Source 
According to vulkan spec moving to the next subpass automatically
performs any multisample resolve operations in the subpass being
ended.
This commit is contained in:
Aliya Pazylbekova
2019-09-20 13:59:26 -04:00
committed by Baldur Karlsson
parent e0c397a343
commit f0329ebace
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.h
+1
View File
@@ -800,6 +800,7 @@ private:
bool CheckMemoryRequirements(const char *resourceName, ResourceId memId,
VkDeviceSize memoryOffset, VkMemoryRequirements mrq);
void AddImplicitResolveResourceUsage(uint32_t subpass = 0);
std::vector<VkImageMemoryBarrier> GetImplicitRenderPassBarriers(uint32_t subpass = 0);
std::string MakeRenderPassOpString(bool store);
renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+32
View File
@@ -45,6 +45,32 @@ static std::string ToHumanStr(const VkAttachmentStoreOp &el)
END_ENUM_STRINGISE();
}
void WrappedVulkan::AddImplicitResolveResourceUsage(uint32_t subpass)
{
ResourceId rp = m_BakedCmdBufferInfo[m_LastCmdBufferID].state.renderPass;
const VulkanCreationInfo::RenderPass &rpinfo = m_CreationInfo.m_RenderPass[rp];
// Ending a render pass instance performs any multisample operations
// on the final subpass. ~0U is the end of a RenderPass.
if(subpass == ~0U)
subpass = (uint32_t)rpinfo.subpasses.size() - 1;
else
subpass = m_BakedCmdBufferInfo[m_LastCmdBufferID].state.subpass;
const std::vector<ResourceId> &fbattachments =
m_BakedCmdBufferInfo[m_LastCmdBufferID].state.fbattachments;
for(size_t i = 0; i < rpinfo.subpasses[subpass].resolveAttachments.size(); i++)
{
uint32_t attIdx = rpinfo.subpasses[subpass].resolveAttachments[i];
if(attIdx == VK_ATTACHMENT_UNUSED)
continue;
ResourceId image = m_CreationInfo.m_ImageView[fbattachments[attIdx]].image;
m_BakedCmdBufferInfo[m_LastCmdBufferID].resourceUsage.push_back(make_rdcpair(
image,
EventUsage(m_BakedCmdBufferInfo[m_LastCmdBufferID].curEventID, ResourceUsage::Resolve)));
}
}
std::vector<VkImageMemoryBarrier> WrappedVulkan::GetImplicitRenderPassBarriers(uint32_t subpass)
{
ResourceId rp, fb;
@@ -1393,6 +1419,8 @@ bool WrappedVulkan::Serialise_vkCmdNextSubpass(SerialiserType &ser, VkCommandBuf
{
ObjDisp(commandBuffer)->CmdNextSubpass(Unwrap(commandBuffer), contents);
AddImplicitResolveResourceUsage();
// track while reading, for fetching the right set of outputs in AddDrawcall
m_BakedCmdBufferInfo[m_LastCmdBufferID].state.subpass++;
@@ -1489,6 +1517,8 @@ bool WrappedVulkan::Serialise_vkCmdEndRenderPass(SerialiserType &ser, VkCommandB
GetResourceManager()->RecordBarriers(m_BakedCmdBufferInfo[cmd].imgbarriers, m_ImageLayouts,
(uint32_t)imgBarriers.size(), imgBarriers.data());
AddImplicitResolveResourceUsage(~0U);
AddEvent();
DrawcallDescription draw;
draw.name = StringFormat::Fmt("vkCmdEndRenderPass(%s)", MakeRenderPassOpString(true).c_str());
@@ -1826,6 +1856,8 @@ bool WrappedVulkan::Serialise_vkCmdNextSubpass2KHR(SerialiserType &ser, VkComman
ObjDisp(commandBuffer)
->CmdNextSubpass2KHR(Unwrap(commandBuffer), &unwrappedBeginInfo, &unwrappedEndInfo);
AddImplicitResolveResourceUsage();
// track while reading, for fetching the right set of outputs in AddDrawcall
m_BakedCmdBufferInfo[m_LastCmdBufferID].state.subpass++;