qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix leak with VAOManager 

Change-Id: I09f15de230c571adb580bdbb3250405f562f255b
Task-number: QTBUG-70892
Reviewed-by: Juan José Casafranca <juan.casafranca@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Paul Lemire 2018-10-03 08:46:28 +02:00
parent c19036f848
commit ff07ec93db
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp
View File

@ -108,6 +108,11 @@ void OpenGLVertexArrayObject::create(SubmissionContext *ctx, const VAOIdentifier
m_owners = key; m_owners = key;
} }
VAOIdentifier OpenGLVertexArrayObject::key() const
{
return m_owners;
}
// called from Render thread // called from Render thread
void OpenGLVertexArrayObject::destroy() void OpenGLVertexArrayObject::destroy()
{ {

1
src/render/renderers/opengl/renderer/openglvertexarrayobject_p.h
View File

@ -73,6 +73,7 @@ public:
void release(); void release();
void create(SubmissionContext *ctx, const VAOIdentifier &key); void create(SubmissionContext *ctx, const VAOIdentifier &key);
VAOIdentifier key() const;
void destroy(); void destroy();
void cleanup(); void cleanup();

3
src/render/renderers/opengl/renderer/renderer.cpp
View File

@ -2142,7 +2142,8 @@ void Renderer::cleanGraphicsResources()
OpenGLVertexArrayObject *vao = m_nodesManager->vaoManager()->data(vaoHandle); OpenGLVertexArrayObject *vao = m_nodesManager->vaoManager()->data(vaoHandle);
if (vao) { if (vao) {
vao->destroy(); vao->destroy();
m_nodesManager->vaoManager()->release(vaoHandle); // We remove VAO from manager using its VAOIdentifier
m_nodesManager->vaoManager()->releaseResource(vao->key());
} }
} }
} }