lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-07 04:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove hardcoded hack to clear backbuffer to black

Browse Source 
* Now handled as a runtime created init state, the same as if we started
  skipping initial states for large images that are write-only
This commit is contained in:
baldurk committed 2016-02-07 18:44:51 +01:00
1 parent da15b25789
commit 6da044ae0a
3 files changed
+130 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

renderdoc/driver/vulkan/vk_core.cpp
+7 -47
View File
@@ -292,8 +292,6 @@ WrappedVulkan::WrappedVulkan(const char *logFilename)
m_DrawcallStack.push_back(&m_ParentDrawcall);
m_FakeBBImgId = ResourceId();
m_ResourceManager = new VulkanResourceManager(m_State, m_pSerialiser, this);
m_pSerialiser->SetUserData(m_ResourceManager);
@@ -1091,6 +1089,9 @@ void WrappedVulkan::ReadLogInitialisation()
{
GetResourceManager()->ApplyInitialContents();
SubmitCmds();
FlushQ();
ContextReplayLog(READING, 0, 0, false);
}
@@ -1608,10 +1609,6 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context)
SERIALISE_ELEMENT(ResourceId, bbid, ResourceId());
ResourceId liveBBid = GetResourceManager()->GetLiveID(bbid);
m_FakeBBImgId = bbid;
bool HasCallstack = false;
localSerialiser->Serialise("HasCallstack", HasCallstack);
@@ -1680,48 +1677,11 @@ void WrappedVulkan::ReplayLog(uint32_t frameID, uint32_t startEventID, uint32_t
if(!partial)
{
GetResourceManager()->ApplyInitialContents();
SubmitCmds();
FlushQ();
GetResourceManager()->ReleaseInFrameResources();
// VKTODOLOW temp hack - clear backbuffer to black
if(m_FakeBBImgId != ResourceId())
{
VkDevice dev = GetDev();
VkCmdBuffer cmd = GetNextCmd();
VkCmdBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, NULL, VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT | VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT };
VkResult vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo);
RDCASSERT(vkr == VK_SUCCESS);
ImageLayouts &st = m_ImageLayouts[GetResourceManager()->GetLiveID(m_FakeBBImgId)];
RDCASSERT(st.subresourceStates.size() == 1);
VkImageMemoryBarrier t;
t.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
t.pNext = NULL;
t.inputMask = 0;
t.outputMask = 0;
t.srcQueueFamilyIndex = 0;
t.destQueueFamilyIndex = 0;
t.image = Unwrap(GetResourceManager()->GetLiveHandle<VkImage>(m_FakeBBImgId));
t.oldLayout = st.subresourceStates[0].state;
t.newLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
t.subresourceRange = st.subresourceStates[0].range;
void *barrier = (void *)&t;
st.subresourceStates[0].state = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, (void **)&barrier);
VkClearColorValue clearColor = { { 0.0f, 0.0f, 0.0f, 1.0f, } };
ObjDisp(cmd)->CmdClearColorImage(Unwrap(cmd), t.image, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, &clearColor, 1, &t.subresourceRange);
vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd));
RDCASSERT(vkr == VK_SUCCESS);
SubmitCmds();
// don't need to flush here
}
}
{
renderdoc/driver/vulkan/vk_core.h
-2
View File
@@ -222,8 +222,6 @@ private:
uint32_t GetReadbackMemoryIndex(uint32_t resourceRequiredBitmask);
uint32_t GetUploadMemoryIndex(uint32_t resourceRequiredBitmask);
uint32_t GetGPULocalMemoryIndex(uint32_t resourceRequiredBitmask);
ResourceId m_FakeBBImgId;
struct BakedCmdBufferInfo
{
renderdoc/driver/vulkan/vk_initstate.cpp
+123 -6
View File
@@ -467,9 +467,131 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager
}
else if(type == eResDeviceMemory || type == eResImage)
{
VkResult vkr = VK_SUCCESS;
VkDevice d = GetDev();
VkCmdBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, NULL, VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT | VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT };
if(type == eResImage && initial.resource == NULL)
{
RDCASSERT(initial.num == eInitialContents_ClearColorImage || initial.num == eInitialContents_ClearDepthStencilImage);
if(initial.num == eInitialContents_ClearColorImage)
{
VkCmdBuffer cmd = GetNextCmd();
vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo);
RDCASSERT(vkr == VK_SUCCESS);
// VKTODOMED handle multiple subresources with different layouts etc
VkImageMemoryBarrier barrier = {
VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, NULL,
0, 0,
m_ImageLayouts[id].subresourceStates[0].state, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
ToHandle<VkImage>(live),
{ VK_IMAGE_ASPECT_COLOR_BIT, 0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS },
};
// finish any pending work before clear
barrier.outputMask = VK_MEMORY_OUTPUT_HOST_WRITE_BIT|
VK_MEMORY_OUTPUT_SHADER_WRITE_BIT|
VK_MEMORY_OUTPUT_COLOR_ATTACHMENT_BIT|
VK_MEMORY_OUTPUT_DEPTH_STENCIL_ATTACHMENT_BIT|
VK_MEMORY_OUTPUT_TRANSFER_BIT;
// clear completes before subsequent operations
barrier.inputMask = VK_MEMORY_INPUT_TRANSFER_BIT;
void *barrierptr = (void *)&barrier;
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, &barrierptr);
VkClearColorValue clearval = { 0.0f, 0.0f, 0.0f, 0.0f };
VkImageSubresourceRange range = { VK_IMAGE_ASPECT_COLOR_BIT, 0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS };
ObjDisp(cmd)->CmdClearColorImage(Unwrap(cmd), ToHandle<VkImage>(live), VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, &clearval, 1, &range);
barrier.newLayout = barrier.oldLayout;
barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL;
// complete clear before any other work
barrier.outputMask = VK_MEMORY_OUTPUT_TRANSFER_BIT;
barrier.inputMask = VK_MEMORY_INPUT_HOST_READ_BIT|
VK_MEMORY_INPUT_INDIRECT_COMMAND_BIT|
VK_MEMORY_INPUT_INDEX_FETCH_BIT|
VK_MEMORY_INPUT_VERTEX_ATTRIBUTE_FETCH_BIT|
VK_MEMORY_INPUT_UNIFORM_READ_BIT|
VK_MEMORY_INPUT_SHADER_READ_BIT|
VK_MEMORY_INPUT_COLOR_ATTACHMENT_BIT|
VK_MEMORY_INPUT_DEPTH_STENCIL_ATTACHMENT_BIT|
VK_MEMORY_INPUT_INPUT_ATTACHMENT_BIT|
VK_MEMORY_INPUT_TRANSFER_BIT;
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, &barrierptr);
vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd));
RDCASSERT(vkr == VK_SUCCESS);
}
else if(initial.num == eInitialContents_ClearDepthStencilImage)
{
VkCmdBuffer cmd = GetNextCmd();
vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo);
RDCASSERT(vkr == VK_SUCCESS);
// VKTODOMED handle multiple subresources with different layouts etc
VkImageMemoryBarrier barrier = {
VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, NULL,
0, 0,
m_ImageLayouts[id].subresourceStates[0].state, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED,
ToHandle<VkImage>(live),
{ VK_IMAGE_ASPECT_COLOR_BIT, 0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS },
};
// finish any pending work before clear
barrier.outputMask = VK_MEMORY_OUTPUT_HOST_WRITE_BIT|
VK_MEMORY_OUTPUT_SHADER_WRITE_BIT|
VK_MEMORY_OUTPUT_COLOR_ATTACHMENT_BIT|
VK_MEMORY_OUTPUT_DEPTH_STENCIL_ATTACHMENT_BIT|
VK_MEMORY_OUTPUT_TRANSFER_BIT;
// clear completes before subsequent operations
barrier.inputMask = VK_MEMORY_INPUT_TRANSFER_BIT;
void *barrierptr = (void *)&barrier;
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, &barrierptr);
VkClearDepthStencilValue clearval = { 1.0f, 0 };
VkImageSubresourceRange range = { VK_IMAGE_ASPECT_DEPTH_BIT|VK_IMAGE_ASPECT_STENCIL_BIT, 0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS };
ObjDisp(cmd)->CmdClearDepthStencilImage(Unwrap(cmd), ToHandle<VkImage>(live), VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL, &clearval, 1, &range);
barrier.newLayout = barrier.oldLayout;
barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL;
// complete clear before any other work
barrier.outputMask = VK_MEMORY_OUTPUT_TRANSFER_BIT;
barrier.inputMask = VK_MEMORY_INPUT_HOST_READ_BIT|
VK_MEMORY_INPUT_INDIRECT_COMMAND_BIT|
VK_MEMORY_INPUT_INDEX_FETCH_BIT|
VK_MEMORY_INPUT_VERTEX_ATTRIBUTE_FETCH_BIT|
VK_MEMORY_INPUT_UNIFORM_READ_BIT|
VK_MEMORY_INPUT_SHADER_READ_BIT|
VK_MEMORY_INPUT_COLOR_ATTACHMENT_BIT|
VK_MEMORY_INPUT_DEPTH_STENCIL_ATTACHMENT_BIT|
VK_MEMORY_INPUT_INPUT_ATTACHMENT_BIT|
VK_MEMORY_INPUT_TRANSFER_BIT;
ObjDisp(cmd)->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, &barrierptr);
vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd));
RDCASSERT(vkr == VK_SUCCESS);
}
else
{
RDCERR("Unexpected initial state type %u with NULL resource", initial.num);
}
return;
}
@@ -488,13 +610,8 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager
memsize = m_CreationInfo.m_Memory[GetResID(dstMem)].size;
}
VkResult vkr = VK_SUCCESS;
VkDevice d = GetDev();
VkCmdBuffer cmd = GetNextCmd();
VkCmdBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO, NULL, VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT | VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT };
vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo);
RDCASSERT(vkr == VK_SUCCESS);