From 020eb9d86ca09bf557599171aebe91a9b132767a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Feb 2018 13:38:58 +0100 Subject: [PATCH] Fix further memory leaks --- SDL/SDLMain.cpp | 1 + ext/native/thin3d/GLRenderManager.cpp | 3 +++ ext/native/thin3d/thin3d_gl.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 67da77c12c..e6258fbe7d 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -913,5 +913,6 @@ int main(int argc, char *argv[]) { #endif glslang::FinalizeProcess(); + ILOG("Leaving main"); return 0; } diff --git a/ext/native/thin3d/GLRenderManager.cpp b/ext/native/thin3d/GLRenderManager.cpp index 9fdc146846..e4a4ab23ae 100644 --- a/ext/native/thin3d/GLRenderManager.cpp +++ b/ext/native/thin3d/GLRenderManager.cpp @@ -56,6 +56,9 @@ GLRenderManager::~GLRenderManager() { for (int i = 0; i < MAX_INFLIGHT_FRAMES; i++) { _assert_(frameData_[i].deleter.IsEmpty()); } + // Was anything deleted during shutdown? + deleter_.Perform(); + // _assert_(deleter_.IsEmpty()); if (!useThread_) { // The main thread is also the render thread. diff --git a/ext/native/thin3d/thin3d_gl.cpp b/ext/native/thin3d/thin3d_gl.cpp index 9799d8de4a..6d81a98c6e 100644 --- a/ext/native/thin3d/thin3d_gl.cpp +++ b/ext/native/thin3d/thin3d_gl.cpp @@ -297,6 +297,7 @@ public: OpenGLPipeline(GLRenderManager *render) : render_(render) { } ~OpenGLPipeline() { + ILOG("OpenGLPipeline released"); for (auto &iter : shaders) { iter->Release(); }