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

potential deadlock addressed

This commit is contained in:
Jack Andersen 2015-10-30 20:33:36 -10:00
parent 9160423fe8
commit 1579fc3626
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/graphicsdev/GL.cpp
View File

@ -494,8 +494,9 @@ struct GLES3CommandQueue : IGraphicsCommandQueue
std::mutex m_mt; std::mutex m_mt;
std::condition_variable m_cv; std::condition_variable m_cv;
std::unique_lock<std::mutex> m_initlk; std::mutex m_initmt;
std::condition_variable m_initcv; std::condition_variable m_initcv;
std::unique_lock<std::mutex> m_initlk;
std::thread m_thr; std::thread m_thr;
/* These members are locked for multithreaded access */ /* These members are locked for multithreaded access */
@ -549,7 +550,7 @@ struct GLES3CommandQueue : IGraphicsCommandQueue
static void RenderingWorker(GLES3CommandQueue* self) static void RenderingWorker(GLES3CommandQueue* self)
{ {
{ {
std::unique_lock<std::mutex> lk(self->m_mt); std::unique_lock<std::mutex> lk(self->m_initmt);
self->m_parent->makeCurrent(); self->m_parent->makeCurrent();
if (glewInit() != GLEW_OK) if (glewInit() != GLEW_OK)
Log.report(LogVisor::FatalError, "unable to init glew"); Log.report(LogVisor::FatalError, "unable to init glew");
@ -633,7 +634,7 @@ struct GLES3CommandQueue : IGraphicsCommandQueue
GLES3CommandQueue(IGraphicsContext* parent) GLES3CommandQueue(IGraphicsContext* parent)
: m_parent(parent), : m_parent(parent),
m_initlk(m_mt), m_initlk(m_initmt),
m_thr(RenderingWorker, this) m_thr(RenderingWorker, this)
{ {
m_initcv.wait(m_initlk); m_initcv.wait(m_initlk);