Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua

This commit is contained in:
James Chen 2012-09-10 17:01:00 +08:00
parent 6a1aae95aa 8fa431fe0a
commit 2f51246bbd
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/platform/mac/CCEGLView.h
View File

@ -38,7 +38,6 @@ class CC_DLL CCEGLView : public CCEGLViewProtocol
{
public:
static CCEGLView* sharedOpenGLView(void);
static void purgeSharedOpenGLView(void);
virtual ~CCEGLView(void);

10
cocos2dx/platform/mac/CCEGLView.mm
View File

@ -41,14 +41,6 @@ CCEGLView* CCEGLView::sharedOpenGLView(void)
return s_sharedView;
}
void CCEGLView::purgeSharedOpenGLView(void)
{
if (s_sharedView)
{
delete s_sharedView;
}
}
CCEGLView::CCEGLView(void)
{
m_obScreenSize.width = m_obDesignResolutionSize.width = [[EAGLView sharedEGLView] getWidth];
@ -78,7 +70,7 @@ void CCEGLView::end(void)
// destroy EAGLView
[[EAGLView sharedEGLView] removeFromSuperview];
purgeSharedOpenGLView();
delete this;
}
void CCEGLView::swapBuffers()