AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-06-24 15:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear Vulkan resources if command buffer abandoned

Browse Source
This commit is contained in:
Jack Andersen 2017-11-06 22:04:44 -10:00
parent 6c3a35f15d
commit 2cd7de7a28
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/graphicsdev/Vulkan.cpp
View File

@ -2349,7 +2349,8 @@ struct VulkanShaderDataBinding : GraphicsDataNode<IShaderDataBinding>
writes[totalWrites].dstSet = m_descSets[b]; writes[totalWrites].dstSet = m_descSets[b];
writes[totalWrites].descriptorCount = 1; writes[totalWrites].descriptorCount = 1;
writes[totalWrites].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; writes[totalWrites].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
writes[totalWrites].pImageInfo = GetTextureGPUResource(m_texs[i].tex.get(), b, m_texs[i].idx, m_texs[i].depth); writes[totalWrites].pImageInfo = GetTextureGPUResource(m_texs[i].tex.get(), b,
m_texs[i].idx, m_texs[i].depth);
writes[totalWrites].dstArrayElement = 0; writes[totalWrites].dstArrayElement = 0;
writes[totalWrites].dstBinding = binding; writes[totalWrites].dstBinding = binding;
m_knownViewHandles[b][i] = writes[totalWrites].pImageInfo->imageView; m_knownViewHandles[b][i] = writes[totalWrites].pImageInfo->imageView;
@ -2382,7 +2383,8 @@ struct VulkanShaderDataBinding : GraphicsDataNode<IShaderDataBinding>
{ {
if (i<m_texs.size() && m_texs[i].tex) if (i<m_texs.size() && m_texs[i].tex)
{ {
const VkDescriptorImageInfo* resComp = GetTextureGPUResource(m_texs[i].tex.get(), b, m_texs[i].idx, m_texs[i].depth); const VkDescriptorImageInfo* resComp = GetTextureGPUResource(m_texs[i].tex.get(), b,
m_texs[i].idx, m_texs[i].depth);
if (resComp->imageView != m_knownViewHandles[b][i]) if (resComp->imageView != m_knownViewHandles[b][i])
{ {
writes[totalWrites].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; writes[totalWrites].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
@ -2983,7 +2985,8 @@ void VulkanTextureD::update(int b)
/* map memory and copy staging data */ /* map memory and copy staging data */
uint8_t* mappedData; uint8_t* mappedData;
ThrowIfFailed(vk::MapMemory(m_q->m_ctx->m_dev, m_cpuMem, m_cpuOffsets[b], m_cpuSz, 0, reinterpret_cast<void**>(&mappedData))); ThrowIfFailed(vk::MapMemory(m_q->m_ctx->m_dev, m_cpuMem, m_cpuOffsets[b], m_cpuSz, 0,
reinterpret_cast<void**>(&mappedData)));
memmove(mappedData, m_stagingBuf.get(), m_cpuSz); memmove(mappedData, m_stagingBuf.get(), m_cpuSz);
vk::UnmapMemory(m_q->m_ctx->m_dev, m_cpuMem); vk::UnmapMemory(m_q->m_ctx->m_dev, m_cpuMem);
@ -3293,8 +3296,9 @@ boo::ObjToken<IShaderPipeline> VulkanDataFactory::Context::newShaderPipeline
ThrowIfFailed(vk::CreatePipelineCache(factory.m_ctx->m_dev, &cacheDataInfo, nullptr, &pipelineCache)); ThrowIfFailed(vk::CreatePipelineCache(factory.m_ctx->m_dev, &cacheDataInfo, nullptr, &pipelineCache));
} }
VulkanShaderPipeline* retval = new VulkanShaderPipeline(m_data, factory.m_ctx, std::move(vertShader), std::move(fragShader), VulkanShaderPipeline* retval = new VulkanShaderPipeline(m_data, factory.m_ctx, std::move(vertShader),
pipelineCache, vtxFmt, srcFac, dstFac, prim, depthTest, depthWrite, colorWrite, std::move(fragShader), pipelineCache, vtxFmt, srcFac,
dstFac, prim, depthTest, depthWrite, colorWrite,
alphaWrite, culling); alphaWrite, culling);
if (pipelineBlob && pipelineBlob->empty()) if (pipelineBlob && pipelineBlob->empty())
@ -3304,7 +3308,8 @@ boo::ObjToken<IShaderPipeline> VulkanDataFactory::Context::newShaderPipeline
if (cacheSz) if (cacheSz)
{ {
pipelineBlob->resize(cacheSz); pipelineBlob->resize(cacheSz);
ThrowIfFailed(vk::GetPipelineCacheData(factory.m_ctx->m_dev, pipelineCache, &cacheSz, pipelineBlob->data())); ThrowIfFailed(vk::GetPipelineCacheData(factory.m_ctx->m_dev, pipelineCache,
&cacheSz, pipelineBlob->data()));
pipelineBlob->resize(cacheSz); pipelineBlob->resize(cacheSz);
} }
} }
@ -3416,7 +3421,8 @@ void VulkanDataFactoryImpl::commitTransaction
if (data->m_DBufs) if (data->m_DBufs)
for (IGraphicsBufferD& buf : *data->m_DBufs) for (IGraphicsBufferD& buf : *data->m_DBufs)
bufMemSize = static_cast<VulkanGraphicsBufferD<BaseGraphicsData>&>(buf).sizeForGPU(m_ctx, bufMemTypeBits, bufMemSize); bufMemSize = static_cast<VulkanGraphicsBufferD<BaseGraphicsData>&>(buf).
sizeForGPU(m_ctx, bufMemTypeBits, bufMemSize);
if (data->m_STexs) if (data->m_STexs)
for (ITextureS& tex : *data->m_STexs) for (ITextureS& tex : *data->m_STexs)
@ -3611,6 +3617,9 @@ void VulkanCommandQueue::execute()
resetCommandBuffer(); resetCommandBuffer();
m_dynamicNeedsReset = true; m_dynamicNeedsReset = true;
m_resolveDispSource = nullptr; m_resolveDispSource = nullptr;
/* Clear dead data */
m_drawResTokens[m_fillBuf].clear();
return; return;
} }
m_submitted = false; m_submitted = false;