AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/boo

This commit is contained in:
Jack Andersen 2018-01-11 15:29:21 -10:00
parent cc6c872747 0a93d6c105
commit cbfd4ddad0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/x11/WindowXlib.cpp
View File

@ -116,8 +116,7 @@ IGraphicsDataFactory* _NewGLDataFactory(IGraphicsContext* parent, GLContext* glC
IGraphicsCommandQueue* _NewVulkanCommandQueue(VulkanContext* ctx, IGraphicsCommandQueue* _NewVulkanCommandQueue(VulkanContext* ctx,
VulkanContext::Window* windowCtx, VulkanContext::Window* windowCtx,
IGraphicsContext* parent); IGraphicsContext* parent);
IGraphicsDataFactory* _NewVulkanDataFactory(IGraphicsContext* parent, VulkanContext* ctx, IGraphicsDataFactory* _NewVulkanDataFactory(IGraphicsContext* parent, VulkanContext* ctx);
uint32_t drawSamples);
#endif #endif
void _XlibUpdateLastGlxCtx(GLXContext lastGlxCtx); void _XlibUpdateLastGlxCtx(GLXContext lastGlxCtx);
void GLXExtensionCheck(); void GLXExtensionCheck();
@ -838,7 +837,7 @@ public:
}); });
initcv.wait(outerLk); initcv.wait(outerLk);
m_dataFactory = _NewVulkanDataFactory(this, m_ctx, m_drawSamples); m_dataFactory = _NewVulkanDataFactory(this, m_ctx);
m_commandQueue = _NewVulkanCommandQueue(m_ctx, m_ctx->m_windows[m_parentWindow].get(), this); m_commandQueue = _NewVulkanCommandQueue(m_ctx, m_ctx->m_windows[m_parentWindow].get(), this);
return true; return true;