Merge pull request #3690 from dabingnn/release30_bug_hot_fix

glfw EGLView alloc on the stack to prevent memory leak

cocos2dx/platform/linux/CCApplication.cpp

@@ -60,7 +60,13 @@ int Application::run()
 			usleep((_animationInterval - iCurTime+iLastTime)*1000);
 		}
     }
-
+    /* Only work on Desktop
+    *  Director::mainLoop is really one frame logic
+    *  when we want to close the window, we should call Director::end();
+    *  then call Director::mainLoop to do release of internal resources
+    */
+    Director::getInstance()->end();
+    Director::getInstance()->mainLoop();
 	return -1;
 }
 

cocos2dx/platform/mac/CCApplication.mm

@@ -60,6 +60,14 @@ int Application::run()
         Director::getInstance()->mainLoop();
         pMainWnd->pollEvents();
     }
+
+    /* Only work on Desktop
+    *  Director::mainLoop is really one frame logic
+    *  when we want to close the window, we should call Director::end();
+    *  then call Director::mainLoop to do release of internal resources
+    */
+    Director::getInstance()->end();
+    Director::getInstance()->mainLoop();
     return true;
 }
 

cocos2dx/platform/win32/CCApplication.cpp

@@ -64,7 +64,14 @@ int Application::run()
             Sleep(0);
         }
     }
-    
+
+    /* Only work on Desktop
+    *  Director::mainLoop is really one frame logic
+    *  when we want to close the window, we should call Director::end();
+    *  then call Director::mainLoop to do release of internal resources
+    */
+    Director::getInstance()->end();
+    Director::getInstance()->mainLoop();
     return true;
 }
 

samples/Cpp/AssetsManagerTest/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

samples/Cpp/HelloCpp/proj.linux/main.cpp

@@ -12,7 +12,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Cpp/HelloCpp/proj.mac/main.cpp

@@ -30,8 +30,8 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }
 

samples/Cpp/HelloCpp/proj.win32/main.cpp

@@ -14,7 +14,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Cpp/SimpleGame/proj.linux/main.cpp

@@ -12,7 +12,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Cpp/SimpleGame/proj.mac/main.cpp

@@ -30,8 +30,8 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }
 

samples/Cpp/TestCpp/proj.linux/main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Cpp/TestCpp/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Cpp/TestCpp/proj.win32/main.cpp

@@ -14,7 +14,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",960,640);
+    EGLView eglView;
+    eglView.init("TestCPP",960,640);
     return Application::getInstance()->run();
 }

samples/Javascript/CocosDragonJS/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Javascript/CocosDragonJS/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

samples/Javascript/CrystalCraze/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Javascript/CrystalCraze/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

samples/Javascript/MoonWarriors/proj.mac/main.cpp

@@ -30,8 +30,8 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }
 

samples/Javascript/MoonWarriors/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

samples/Javascript/TestJavascript/proj.mac/main.cpp

@@ -30,8 +30,8 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }
 

samples/Javascript/TestJavascript/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

samples/Javascript/WatermelonWithMe/proj.mac/main.cpp

@@ -30,8 +30,8 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }
 

samples/Javascript/WatermelonWithMe/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

samples/Lua/HelloLua/proj.linux/main.cpp

@@ -12,7 +12,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Lua/HelloLua/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Lua/HelloLua/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     
     int ret = Application::getInstance()->run();
 

samples/Lua/TestLua/proj.linux/main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Lua/TestLua/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

samples/Lua/TestLua/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

template/multi-platform-cpp/proj.linux/main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

template/multi-platform-cpp/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

template/multi-platform-cpp/proj.win32/main.cpp

@@ -14,7 +14,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

template/multi-platform-js/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();
 

template/multi-platform-lua/proj.linux/main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char **argv)
 {
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

template/multi-platform-lua/proj.mac/main.cpp

@@ -30,7 +30,7 @@ USING_NS_CC;
 int main(int argc, char *argv[])
 {
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
     return Application::getInstance()->run();
 }

template/multi-platform-lua/proj.win32/main.cpp

@@ -24,8 +24,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 
     // create the application instance
     AppDelegate app;
-    EGLView* eglView = new EGLView();
-    eglView->init("TestCPP",900,640);
+    EGLView eglView;
+    eglView.init("TestCPP",900,640);
 
     int ret = Application::getInstance()->run();