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

fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash.

This commit is contained in:
dumganhar 2012-01-09 13:45:56 +08:00
parent 259aaf42a6
commit 4cc1658d45
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/CCGL.h
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#define CC_GLVIEW cocos2d::CCEGLView #define CC_GLVIEW cocos2d::CCEGLView
#define ccglOrtho glOrthof #define ccglOrtho glOrthof
#define ccglClearDepth glClearDepthf #define ccglClearDepth glClearDepthf
#if (CC_TARGET_PLATFORM == CC_PLATFORM_QNX) || (CC_TARGET_PLATFORM == CC_PLATFORM_BADA) #if (CC_TARGET_PLATFORM == CC_PLATFORM_QNX) || defined(CC_BADA_2_0)
#define ccglGenerateMipmap CCEGLView::glGenerateMipmapOES #define ccglGenerateMipmap CCEGLView::glGenerateMipmapOES
#define ccglGenFramebuffers CCEGLView::glGenFramebuffersOES #define ccglGenFramebuffers CCEGLView::glGenFramebuffersOES
#define ccglBindFramebuffer CCEGLView::glBindFramebufferOES #define ccglBindFramebuffer CCEGLView::glBindFramebufferOES

7
cocos2dx/platform/bada/CCEGLView_bada.cpp
View File

@ -173,14 +173,14 @@ private:
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// impliment CCEGLView // impliment CCEGLView
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifdef CC_BADA_2_0
PFNGLGENERATEMIPMAPOESPROC CCEGLView::glGenerateMipmapOES = 0; PFNGLGENERATEMIPMAPOESPROC CCEGLView::glGenerateMipmapOES = 0;
PFNGLGENFRAMEBUFFERSOESPROC CCEGLView::glGenFramebuffersOES = 0; PFNGLGENFRAMEBUFFERSOESPROC CCEGLView::glGenFramebuffersOES = 0;
PFNGLBINDFRAMEBUFFEROESPROC CCEGLView::glBindFramebufferOES = 0; PFNGLBINDFRAMEBUFFEROESPROC CCEGLView::glBindFramebufferOES = 0;
PFNGLFRAMEBUFFERTEXTURE2DOESPROC CCEGLView::glFramebufferTexture2DOES = 0; PFNGLFRAMEBUFFERTEXTURE2DOESPROC CCEGLView::glFramebufferTexture2DOES = 0;
PFNGLDELETEFRAMEBUFFERSOESPROC CCEGLView::glDeleteFramebuffersOES = 0; PFNGLDELETEFRAMEBUFFERSOESPROC CCEGLView::glDeleteFramebuffersOES = 0;
PFNGLCHECKFRAMEBUFFERSTATUSOESPROC CCEGLView::glCheckFramebufferStatusOES = 0; PFNGLCHECKFRAMEBUFFERSTATUSOESPROC CCEGLView::glCheckFramebufferStatusOES = 0;
#endif
CCEGLView::CCEGLView() CCEGLView::CCEGLView()
: m_pKeypad(null) : m_pKeypad(null)
, m_bNotHVGA(true) , m_bNotHVGA(true)
@ -189,13 +189,14 @@ CCEGLView::CCEGLView()
, m_bCaptured(false) , m_bCaptured(false)
, m_pEGL(NULL) , m_pEGL(NULL)
{ {
#ifdef CC_BADA_2_0
glGenerateMipmapOES = (PFNGLGENERATEMIPMAPOESPROC)eglGetProcAddress("glGenerateMipmapOES"); glGenerateMipmapOES = (PFNGLGENERATEMIPMAPOESPROC)eglGetProcAddress("glGenerateMipmapOES");
glGenFramebuffersOES = (PFNGLGENFRAMEBUFFERSOESPROC)eglGetProcAddress("glGenFramebuffersOES"); glGenFramebuffersOES = (PFNGLGENFRAMEBUFFERSOESPROC)eglGetProcAddress("glGenFramebuffersOES");
glBindFramebufferOES = (PFNGLBINDFRAMEBUFFEROESPROC)eglGetProcAddress("glBindFramebufferOES"); glBindFramebufferOES = (PFNGLBINDFRAMEBUFFEROESPROC)eglGetProcAddress("glBindFramebufferOES");
glFramebufferTexture2DOES = (PFNGLFRAMEBUFFERTEXTURE2DOESPROC)eglGetProcAddress("glFramebufferTexture2DOES"); glFramebufferTexture2DOES = (PFNGLFRAMEBUFFERTEXTURE2DOESPROC)eglGetProcAddress("glFramebufferTexture2DOES");
glDeleteFramebuffersOES = (PFNGLDELETEFRAMEBUFFERSOESPROC)eglGetProcAddress("glDeleteFramebuffersOES"); glDeleteFramebuffersOES = (PFNGLDELETEFRAMEBUFFERSOESPROC)eglGetProcAddress("glDeleteFramebuffersOES");
glCheckFramebufferStatusOES = (PFNGLCHECKFRAMEBUFFERSTATUSOESPROC)eglGetProcAddress("glCheckFramebufferStatusOES"); glCheckFramebufferStatusOES = (PFNGLCHECKFRAMEBUFFERSTATUSOESPROC)eglGetProcAddress("glCheckFramebufferStatusOES");
#endif
m_pTouch = new CCTouch; m_pTouch = new CCTouch;
m_pSet = new CCSet; m_pSet = new CCSet;
m_eInitOrientation = CCDirector::sharedDirector()->getDeviceOrientation(); m_eInitOrientation = CCDirector::sharedDirector()->getDeviceOrientation();

2
cocos2dx/platform/bada/CCEGLView_bada.h
View File

@ -117,6 +117,7 @@ public:
virtual void OnTextValueChanged(const Osp::Ui::Control& source); virtual void OnTextValueChanged(const Osp::Ui::Control& source);
virtual void OnTextValueChangeCanceled(const Osp::Ui::Control& source); virtual void OnTextValueChangeCanceled(const Osp::Ui::Control& source);
#ifdef CC_BADA_2_0
// pointer to OES methods from EGL // pointer to OES methods from EGL
static PFNGLGENERATEMIPMAPOESPROC glGenerateMipmapOES; static PFNGLGENERATEMIPMAPOESPROC glGenerateMipmapOES;
static PFNGLGENFRAMEBUFFERSOESPROC glGenFramebuffersOES; static PFNGLGENFRAMEBUFFERSOESPROC glGenFramebuffersOES;
@ -124,6 +125,7 @@ public:
static PFNGLFRAMEBUFFERTEXTURE2DOESPROC glFramebufferTexture2DOES; static PFNGLFRAMEBUFFERTEXTURE2DOESPROC glFramebufferTexture2DOES;
static PFNGLDELETEFRAMEBUFFERSOESPROC glDeleteFramebuffersOES; static PFNGLDELETEFRAMEBUFFERSOESPROC glDeleteFramebuffersOES;
static PFNGLCHECKFRAMEBUFFERSTATUSOESPROC glCheckFramebufferStatusOES; static PFNGLCHECKFRAMEBUFFERSTATUSOESPROC glCheckFramebufferStatusOES;
#endif
private: private:
Osp::Ui::Controls::Keypad *m_pKeypad; Osp::Ui::Controls::Keypad *m_pKeypad;