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

Use semaphores to synchronise unbind/bind of sparse mappings

Browse Source 
* For non-image mappings (image opaque and buffer) we unbind the whole
  resource then bind the initial mapping. This means two batches though
  so needs to be synchronised.
This commit is contained in:
baldurk
2015-12-17 14:31:10 +01:00
parent 78d34fe0e6
commit bc10ce84ba
4 changed files with 99 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_core.cpp
+37
View File
@@ -406,6 +406,43 @@ void WrappedVulkan::SubmitCmds()
m_InternalCmds.pendingcmds.clear();
}
VkSemaphore WrappedVulkan::GetNextSemaphore()
{
VkSemaphore ret;
if(!m_InternalCmds.freesems.empty())
{
ret = m_InternalCmds.freesems.back();
m_InternalCmds.freesems.pop_back();
// assume semaphore is back to unsignaled state after being waited on
}
else
{
VkSemaphoreCreateInfo semInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO };
VkResult vkr = ObjDisp(m_Device)->CreateSemaphore(Unwrap(m_Device), &semInfo, NULL, &ret);
RDCASSERT(vkr == VK_SUCCESS);
GetResourceManager()->WrapResource(Unwrap(m_Device), ret);
}
m_InternalCmds.pendingsems.push_back(ret);
return ret;
}
void WrappedVulkan::SubmitSemaphores()
{
// nothing to do
if(m_InternalCmds.pendingsems.empty())
return;
// no actual submission, just mark them as 'done with' so they will be
// recycled on next flush
m_InternalCmds.submittedsems.insert(m_InternalCmds.submittedsems.end(), m_InternalCmds.pendingsems.begin(), m_InternalCmds.pendingsems.end());
m_InternalCmds.pendingsems.clear();
}
void WrappedVulkan::FlushQ()
{
// VKTODOLOW could do away with the need for this function by keeping
renderdoc/driver/vulkan/vk_core.h
+19 -6
View File
@@ -207,16 +207,27 @@ private:
freecmds.clear();
pendingcmds.clear();
submittedcmds.clear();
freecmds.clear();
pendingcmds.clear();
submittedcmds.clear();
}
VkCommandPool m_CmdPool; // the command pool used for allocating our own command buffers
vector<VkCommandBuffer> freecmds;
// -> record ->
vector<VkCommandBuffer> pendingcmds;
// -> submit ->
vector<VkCommandBuffer> submittedcmds;
// -> flush/waitidle -> freecmds
vector<VkCommandBuffer> freecmds; // <
// -> GetNextCmd() -> // |
vector<VkCommandBuffer> pendingcmds; // |
// -> SubmitCmds() -> |
vector<VkCommandBuffer> submittedcmds; // |
// -> FlushQ() ----------------------------^
vector<VkSemaphore> freesems; // <
// -> GetNextSemaphore() -> // |
vector<VkSemaphore> pendingsems; // |
// -> SubmitSemaphores() -> |
vector<VkSemaphore> submittedsems; // |
// -> FlushQ() -----------------------^
} m_InternalCmds;
vector<VkDeviceMemory> m_CleanupMems;
@@ -229,6 +240,8 @@ private:
VkPhysicalDevice GetPhysDev() { RDCASSERT(m_PhysicalDevice != VK_NULL_HANDLE); return m_PhysicalDevice; }
VkCommandBuffer GetNextCmd();
void SubmitCmds();
VkSemaphore GetNextSemaphore();
void SubmitSemaphores();
void FlushQ();
const VkPhysicalDeviceFeatures &GetDeviceFeatures()
renderdoc/driver/vulkan/vk_initstate.cpp
+35 -9
View File
@@ -722,14 +722,19 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkBuffer *buf, VulkanResourc
buf->real.As<VkBuffer>(), 1, &unbind
};
// VKTODOLOW need to signal/wait semaphore between the unbind and bind
VkDevice d = GetDev();
// this semaphore separates the unbind and bind, as there isn't an ordering guarantee
// for two adjacent batches that bind the same resource.
VkSemaphore sem = GetNextSemaphore();
VkBindSparseInfo bindsparse = {
VK_STRUCTURE_TYPE_BIND_SPARSE_INFO, NULL,
0, NULL, // wait semaphores
1, &bufBind,
0, NULL, // image opaque
0, NULL, // image bind
0, NULL, // signal semaphores
1, UnwrapPtr(sem), // signal semaphores
};
// first unbind all
@@ -740,17 +745,25 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkBuffer *buf, VulkanResourc
{
bufBind.bindCount = info->numBinds;
bufBind.pBinds = info->binds;
// wait for unbind semaphore
bindsparse.waitSemaphoreCount = 1;
bindsparse.pWaitSemaphores = bindsparse.pSignalSemaphores;
bindsparse.signalSemaphoreCount = 0;
bindsparse.pSignalSemaphores = NULL;
// VKTODOLOW need to signal/wait semaphore after bind somehow
ObjDisp(q)->QueueBindSparse(Unwrap(q), 1, &bindsparse, VK_NULL_HANDLE);
}
// marks that the above semaphore has been used, so next time we
// flush it will be moved back to the pool
SubmitSemaphores();
VkResult vkr = VK_SUCCESS;
VkBuffer srcBuf = (VkBuffer)(uint64_t)contents.resource;
VkDevice d = GetDev();
VkCommandBuffer cmd = GetNextCmd();
VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT };
@@ -791,6 +804,8 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkBuffer *buf, VulkanResourc
vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd));
RDCASSERT(vkr == VK_SUCCESS);
FlushQ();
return true;
}
@@ -818,15 +833,16 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkImage *im, VulkanResourceM
VkSparseImageOpaqueMemoryBindInfo opaqueBind = {
im->real.As<VkImage>(), 1, &unbind
};
VkSemaphore sem = GetNextSemaphore();
// VKTODOLOW need to signal/wait semaphore between the unbind and bind
VkBindSparseInfo bindsparse = {
VK_STRUCTURE_TYPE_BIND_SPARSE_INFO, NULL,
0, NULL, // wait semaphores
0, NULL, // buffer bind
1, &opaqueBind,
0, NULL, // image bind
0, NULL, // signal semaphores
1, UnwrapPtr(sem), // signal semaphores
};
// first unbind all
@@ -837,15 +853,25 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkImage *im, VulkanResourceM
{
opaqueBind.bindCount = info->opaqueCount;
opaqueBind.pBinds = info->opaque;
// VKTODOLOW need to signal/wait semaphore after bind somehow
// wait for unbind semaphore
bindsparse.waitSemaphoreCount = 1;
bindsparse.pWaitSemaphores = bindsparse.pSignalSemaphores;
bindsparse.signalSemaphoreCount = 0;
bindsparse.pSignalSemaphores = NULL;
ObjDisp(q)->QueueBindSparse(Unwrap(q), 1, &bindsparse, VK_NULL_HANDLE);
}
// marks that the above semaphore has been used, so next time we
// flush it will be moved back to the pool
SubmitSemaphores();
}
{
VkSparseImageMemoryBindInfo imgBinds[NUM_VK_IMAGE_ASPECTS] = { 0 };
// VKTODOLOW need to signal/wait semaphore after bind somehow
VkBindSparseInfo bindsparse = {
VK_STRUCTURE_TYPE_BIND_SPARSE_INFO, NULL,
0, NULL, // wait semaphores
renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+8 -1
View File
@@ -759,8 +759,9 @@ VkResult WrappedVulkan::vkCreateDevice(
void WrappedVulkan::vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator)
{
// flush out any pending commands
// flush out any pending commands/semaphores
SubmitCmds();
SubmitSemaphores();
FlushQ();
// MULTIDEVICE this function will need to check if the device is the one we
@@ -784,6 +785,12 @@ void WrappedVulkan::vkDestroyDevice(VkDevice device, const VkAllocationCallbacks
ObjDisp(m_Device)->DestroyCommandPool(Unwrap(m_Device), Unwrap(m_InternalCmds.m_CmdPool), NULL);
GetResourceManager()->ReleaseWrappedResource(m_InternalCmds.m_CmdPool);
}
for(size_t i=0; i < m_InternalCmds.freesems.size(); i++)
{
ObjDisp(m_Device)->DestroySemaphore(Unwrap(m_Device), Unwrap(m_InternalCmds.freesems[i]), NULL);
GetResourceManager()->ReleaseWrappedResource(m_InternalCmds.freesems[i]);
}
m_InternalCmds.Reset();