AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-09 05:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS X updates; post-frame handler event

Browse Source
This commit is contained in:
Jack Andersen
2015-12-20 14:40:52 -10:00
parent 886ae22e08
commit 01ab873e06
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/graphicsdev/GL.cpp
View File

@@ -727,6 +727,8 @@ struct GLCommandQueue : IGraphicsCommandQueue
/* These members are locked for multithreaded access */
std::vector<RenderTextureResize> m_pendingResizes;
std::vector<std::function<void(void)>> m_pendingPosts1;
std::vector<std::function<void(void)>> m_pendingPosts2;
std::vector<GLVertexFormat*> m_pendingFmtAdds;
std::vector<std::array<GLuint, 3>> m_pendingFmtDels;
std::vector<GLTextureR*> m_pendingFboAdds;
@@ -812,6 +814,7 @@ struct GLCommandQueue : IGraphicsCommandQueue
self->m_initcv.notify_one();
while (self->m_running)
{
std::vector<std::function<void(void)>> posts;
{
std::unique_lock<std::mutex> lk(self->m_mt);
self->m_cv.wait(lk);
@@ -853,6 +856,9 @@ struct GLCommandQueue : IGraphicsCommandQueue
glDeleteFramebuffers(1, &fbo);
self->m_pendingFboDels.clear();
}
if (self->m_pendingPosts2.size())
posts.swap(self->m_pendingPosts2);
}
std::vector<Command>& cmds = self->m_cmdBufs[self->m_drawBuf];
GLenum prim = GL_TRIANGLES;
@@ -924,6 +930,8 @@ struct GLCommandQueue : IGraphicsCommandQueue
}
}
cmds.clear();
for (auto& p : posts)
p();
}
}
@@ -983,6 +991,11 @@ struct GLCommandQueue : IGraphicsCommandQueue
m_pendingResizes.push_back({texgl, width, height});
}
void schedulePostFrameHandler(std::function<void(void)>&& func)
{
m_pendingPosts1.push_back(std::move(func));
}
void setClearColor(const float rgba[4])
{
std::vector<Command>& cmds = m_cmdBufs[m_fillBuf];
@@ -1113,6 +1126,10 @@ struct GLCommandQueue : IGraphicsCommandQueue
datalk.unlock();
glFlush();
for (auto& p : m_pendingPosts1)
m_pendingPosts2.push_back(std::move(p));
m_pendingPosts1.clear();
lk.unlock();
m_cv.notify_one();
m_cmdBufs[m_fillBuf].clear();

5
lib/graphicsdev/Metal.mm
View File

@@ -611,6 +611,11 @@ struct MetalCommandQueue : IGraphicsCommandQueue
MetalTextureR* ctex = static_cast<MetalTextureR*>(tex);
m_texResizes[ctex] = std::make_pair(width, height);
}
void schedulePostFrameHandler(std::function<void(void)>&& func)
{
func();
}
void flushBufferUpdates() {}