AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-19 01:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hold shader data bindings through to rendering worker

Browse Source
This commit is contained in:
Jack Andersen
2017-01-19 17:52:40 -10:00
parent 65f8302060
commit ee9f3efe61
8 changed files with 124 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/graphicsdev/Vulkan.cpp
View File

@@ -8,6 +8,7 @@
#include <SPIRV/GlslangToSpv.h>
#include <SPIRV/disassemble.h>
#include "boo/graphicsdev/GLSLMacros.hpp"
#include "Common.hpp"
#include "logvisor/logvisor.hpp"
@@ -652,7 +653,7 @@ void VulkanContext::resizeSwapChain(VulkanContext::Window& windowCtx, VkSurfaceK
}
}
struct VulkanData : IGraphicsData
struct VulkanData : IGraphicsDataPriv<VulkanData>
{
VulkanContext* m_ctx;
VkDeviceMemory m_bufMem = VK_NULL_HANDLE;
@@ -1947,7 +1948,7 @@ static const VkDescriptorImageInfo* GetTextureGPUResource(const ITexture* tex, i
return nullptr;
}
struct VulkanShaderDataBinding : IShaderDataBinding
struct VulkanShaderDataBinding : IShaderDataBindingPriv<VulkanData>
{
VulkanContext* m_ctx;
VulkanShaderPipeline* m_pipeline;
@@ -1977,14 +1978,16 @@ struct VulkanShaderDataBinding : IShaderDataBinding
bool m_committed = false;
#endif
VulkanShaderDataBinding(VulkanContext* ctx,
VulkanShaderDataBinding(VulkanData* d,
VulkanContext* ctx,
IShaderPipeline* pipeline,
IGraphicsBuffer* vbuf, IGraphicsBuffer* instVbuf, IGraphicsBuffer* ibuf,
size_t ubufCount, IGraphicsBuffer** ubufs,
const size_t* ubufOffs, const size_t* ubufSizes,
size_t texCount, ITexture** texs,
size_t baseVert, size_t baseInst)
: m_ctx(ctx),
: IShaderDataBindingPriv(d),
m_ctx(ctx),
m_pipeline(static_cast<VulkanShaderPipeline*>(pipeline)),
m_vbuf(vbuf),
m_instVbuf(instVbuf),
@@ -2812,7 +2815,7 @@ void VulkanDataFactory::destroyAllData()
{
std::unique_lock<std::mutex> lk(m_committedMutex);
for (IGraphicsData* data : m_committedData)
delete static_cast<VulkanData*>(data);
data->decrement();
for (IGraphicsBufferPool* pool : m_committedPools)
delete static_cast<VulkanPool*>(pool);
m_committedData.clear();
@@ -3062,11 +3065,12 @@ IShaderDataBinding* VulkanDataFactory::Context::newShaderDataBinding(IShaderPipe
size_t texCount, ITexture** texs,
size_t baseVert, size_t baseInst)
{
VulkanData* d = static_cast<VulkanData*>(m_deferredData.get());
VulkanShaderDataBinding* retval =
new VulkanShaderDataBinding(m_parent.m_ctx, pipeline, vbuf, instVbuf, ibuf,
new VulkanShaderDataBinding(d, m_parent.m_ctx, pipeline, vbuf, instVbuf, ibuf,
ubufCount, ubufs, ubufOffs, ubufSizes, texCount, texs,
baseVert, baseInst);
static_cast<VulkanData*>(m_deferredData.get())->m_SBinds.emplace_back(retval);
d->m_SBinds.emplace_back(retval);
return retval;
}
@@ -3301,7 +3305,7 @@ void VulkanCommandQueue::execute()
{
if ((*it)->m_dead)
{
delete *it;
it->decrement();
it = gfxF->m_committedData.erase(it);
continue;
}