git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-10 06:34:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

gl_engine: ++thread safety

Browse source 
The `dispose()` method can be called on a worker thread.
GL resources are released on `sync()`, ensuring guaranteed thread safety.
This commit is contained in:
Hermet Park 2024-07-05 01:01:36 +09:00 • committed by Hermet Park
parent 4693d7f4c1
commit 688952be56
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/renderer/gl_engine/tvgGlRenderer.cpp
View file

@ -42,6 +42,15 @@ static void _termEngine()
//TODO: Clean up global resources //TODO: Clean up global resources
} }
void GlRenderer::clearDisposes()
{
if (mDisposed.textures.count > 0) {
glDeleteTextures(mDisposed.textures.count, mDisposed.textures.data);
mDisposed.textures.clear();
}
}
/************************************************************************/ /************************************************************************/
/* External Class Implementation */ /* External Class Implementation */
/************************************************************************/ /************************************************************************/
@ -50,6 +59,8 @@ static void _termEngine()
bool GlRenderer::clear() bool GlRenderer::clear()
{ {
clearDisposes();
mClearBuffer = true; mClearBuffer = true;
return true; return true;
} }
@ -112,6 +123,8 @@ bool GlRenderer::sync()
mRenderPassStack.clear(); mRenderPassStack.clear();
clearDisposes();
delete task; delete task;
return true; return true;
@ -384,7 +397,11 @@ void GlRenderer::dispose(RenderData data)
auto sdata = static_cast<GlShape*>(data); auto sdata = static_cast<GlShape*>(data);
if (!sdata) return; if (!sdata) return;
if (sdata->texId) glDeleteTextures(1, &sdata->texId); //dispose the non thread-safety resources on clearDisposes() call
if (sdata->texId) {
ScopedLock lock(mDisposed.key);
mDisposed.textures.push(sdata->texId);
}
delete sdata; delete sdata;
} }

8
src/renderer/gl_engine/tvgGlRenderer.h
View file

@ -96,6 +96,8 @@ private:
void prepareCmpTask(GlRenderTask* task, const RenderRegion& vp, uint32_t cmpWidth, uint32_t cmpHeight); void prepareCmpTask(GlRenderTask* task, const RenderRegion& vp, uint32_t cmpWidth, uint32_t cmpHeight);
void endRenderPass(Compositor* cmp); void endRenderPass(Compositor* cmp);
void clearDisposes();
Surface surface; Surface surface;
GLint mTargetFboId = 0; GLint mTargetFboId = 0;
RenderRegion mViewport; RenderRegion mViewport;
@ -107,6 +109,12 @@ private:
vector<GlRenderPass> mRenderPassStack = {}; vector<GlRenderPass> mRenderPassStack = {};
vector<unique_ptr<GlCompositor>> mComposeStack = {}; vector<unique_ptr<GlCompositor>> mComposeStack = {};
//Disposed resources. They should be released on synced call.
struct {
Array<GLuint> textures = {};
Key key;
} mDisposed;
bool mClearBuffer = true; bool mClearBuffer = true;
}; };