Commit 5834d4c1 authored by nadro's avatar nadro

- Fixed MacOSX memory leak issue in event handling.

- Fixed MacOSX compilation errors.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4107 dfc29bdd-3216-0410-991c-e03cc46cb475
parent a4abd6e0
...@@ -1925,7 +1925,11 @@ inline void COpenGLExtensionHandler::extGlBindFramebuffer(GLenum target, GLuint ...@@ -1925,7 +1925,11 @@ inline void COpenGLExtensionHandler::extGlBindFramebuffer(GLenum target, GLuint
else if (pGlBindFramebufferEXT) else if (pGlBindFramebufferEXT)
pGlBindFramebufferEXT(target, framebuffer); pGlBindFramebufferEXT(target, framebuffer);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glBindFramebuffer(target, framebuffer);
#else
glBindFramebufferARB(target, framebuffer); glBindFramebufferARB(target, framebuffer);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glBindFramebufferEXT(target, framebuffer); glBindFramebufferEXT(target, framebuffer);
#else #else
...@@ -1941,7 +1945,11 @@ inline void COpenGLExtensionHandler::extGlDeleteFramebuffers(GLsizei n, const GL ...@@ -1941,7 +1945,11 @@ inline void COpenGLExtensionHandler::extGlDeleteFramebuffers(GLsizei n, const GL
else if (pGlDeleteFramebuffersEXT) else if (pGlDeleteFramebuffersEXT)
pGlDeleteFramebuffersEXT(n, framebuffers); pGlDeleteFramebuffersEXT(n, framebuffers);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glDeleteFramebuffers(n, framebuffers);
#else
glDeleteFramebuffersARB(n, framebuffers); glDeleteFramebuffersARB(n, framebuffers);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glDeleteFramebuffersEXT(n, framebuffers); glDeleteFramebuffersEXT(n, framebuffers);
#else #else
...@@ -1957,7 +1965,11 @@ inline void COpenGLExtensionHandler::extGlGenFramebuffers(GLsizei n, GLuint *fra ...@@ -1957,7 +1965,11 @@ inline void COpenGLExtensionHandler::extGlGenFramebuffers(GLsizei n, GLuint *fra
else if (pGlGenFramebuffersEXT) else if (pGlGenFramebuffersEXT)
pGlGenFramebuffersEXT(n, framebuffers); pGlGenFramebuffersEXT(n, framebuffers);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glGenFramebuffers(n, framebuffers);
#else
glGenFramebuffersARB(n, framebuffers); glGenFramebuffersARB(n, framebuffers);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glGenFramebuffersEXT(n, framebuffers); glGenFramebuffersEXT(n, framebuffers);
#else #else
...@@ -1975,7 +1987,11 @@ inline GLenum COpenGLExtensionHandler::extGlCheckFramebufferStatus(GLenum target ...@@ -1975,7 +1987,11 @@ inline GLenum COpenGLExtensionHandler::extGlCheckFramebufferStatus(GLenum target
else else
return 0; return 0;
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
return glCheckFramebufferStatus(target);
#else
return glCheckFramebufferStatusARB(target); return glCheckFramebufferStatusARB(target);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
return glCheckFramebufferStatusEXT(target); return glCheckFramebufferStatusEXT(target);
#else #else
...@@ -1992,7 +2008,11 @@ inline void COpenGLExtensionHandler::extGlFramebufferTexture2D(GLenum target, GL ...@@ -1992,7 +2008,11 @@ inline void COpenGLExtensionHandler::extGlFramebufferTexture2D(GLenum target, GL
else if (pGlFramebufferTexture2DEXT) else if (pGlFramebufferTexture2DEXT)
pGlFramebufferTexture2DEXT(target, attachment, textarget, texture, level); pGlFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glFramebufferTexture2D(target, attachment, textarget, texture, level);
#else
glFramebufferTexture2DARB(target, attachment, textarget, texture, level); glFramebufferTexture2DARB(target, attachment, textarget, texture, level);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glFramebufferTexture2DEXT(target, attachment, textarget, texture, level); glFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
#else #else
...@@ -2008,7 +2028,11 @@ inline void COpenGLExtensionHandler::extGlBindRenderbuffer(GLenum target, GLuint ...@@ -2008,7 +2028,11 @@ inline void COpenGLExtensionHandler::extGlBindRenderbuffer(GLenum target, GLuint
else if (pGlBindRenderbufferEXT) else if (pGlBindRenderbufferEXT)
pGlBindRenderbufferEXT(target, renderbuffer); pGlBindRenderbufferEXT(target, renderbuffer);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glBindRenderbuffer(target, renderbuffer);
#else
glBindRenderbufferARB(target, renderbuffer); glBindRenderbufferARB(target, renderbuffer);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glBindRenderbufferEXT(target, renderbuffer); glBindRenderbufferEXT(target, renderbuffer);
#else #else
...@@ -2024,7 +2048,11 @@ inline void COpenGLExtensionHandler::extGlDeleteRenderbuffers(GLsizei n, const G ...@@ -2024,7 +2048,11 @@ inline void COpenGLExtensionHandler::extGlDeleteRenderbuffers(GLsizei n, const G
else if (pGlDeleteRenderbuffersEXT) else if (pGlDeleteRenderbuffersEXT)
pGlDeleteRenderbuffersEXT(n, renderbuffers); pGlDeleteRenderbuffersEXT(n, renderbuffers);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glDeleteRenderbuffers(n, renderbuffers);
#else
glDeleteRenderbuffersARB(n, renderbuffers); glDeleteRenderbuffersARB(n, renderbuffers);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glDeleteRenderbuffersEXT(n, renderbuffers); glDeleteRenderbuffersEXT(n, renderbuffers);
#else #else
...@@ -2040,7 +2068,11 @@ inline void COpenGLExtensionHandler::extGlGenRenderbuffers(GLsizei n, GLuint *re ...@@ -2040,7 +2068,11 @@ inline void COpenGLExtensionHandler::extGlGenRenderbuffers(GLsizei n, GLuint *re
else if (pGlGenRenderbuffersEXT) else if (pGlGenRenderbuffersEXT)
pGlGenRenderbuffersEXT(n, renderbuffers); pGlGenRenderbuffersEXT(n, renderbuffers);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glGenRenderbuffers(n, renderbuffers);
#else
glGenRenderbuffersARB(n, renderbuffers); glGenRenderbuffersARB(n, renderbuffers);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glGenRenderbuffersEXT(n, renderbuffers); glGenRenderbuffersEXT(n, renderbuffers);
#else #else
...@@ -2056,7 +2088,11 @@ inline void COpenGLExtensionHandler::extGlRenderbufferStorage(GLenum target, GLe ...@@ -2056,7 +2088,11 @@ inline void COpenGLExtensionHandler::extGlRenderbufferStorage(GLenum target, GLe
else if (pGlRenderbufferStorageEXT) else if (pGlRenderbufferStorageEXT)
pGlRenderbufferStorageEXT(target, internalformat, width, height); pGlRenderbufferStorageEXT(target, internalformat, width, height);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glRenderbufferStorage(target, internalformat, width, height);
#else
glRenderbufferStorageARB(target, internalformat, width, height); glRenderbufferStorageARB(target, internalformat, width, height);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glRenderbufferStorageEXT(target, internalformat, width, height); glRenderbufferStorageEXT(target, internalformat, width, height);
#else #else
...@@ -2072,7 +2108,11 @@ inline void COpenGLExtensionHandler::extGlFramebufferRenderbuffer(GLenum target, ...@@ -2072,7 +2108,11 @@ inline void COpenGLExtensionHandler::extGlFramebufferRenderbuffer(GLenum target,
else if (pGlFramebufferRenderbufferEXT) else if (pGlFramebufferRenderbufferEXT)
pGlFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer); pGlFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
#else
glFramebufferRenderbufferARB(target, attachment, renderbuffertarget, renderbuffer); glFramebufferRenderbufferARB(target, attachment, renderbuffertarget, renderbuffer);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer); glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
#else #else
...@@ -2088,7 +2128,11 @@ inline void COpenGLExtensionHandler::extGlGenerateMipmap(GLenum target) ...@@ -2088,7 +2128,11 @@ inline void COpenGLExtensionHandler::extGlGenerateMipmap(GLenum target)
else if (pGlGenerateMipmapEXT) else if (pGlGenerateMipmapEXT)
pGlGenerateMipmapEXT(target); pGlGenerateMipmapEXT(target);
#elif defined(GL_ARB_framebuffer_object) #elif defined(GL_ARB_framebuffer_object)
#ifdef __MAC_10_6
glGenerateMipmap(target);
#else
glGenerateMipmapARB(target); glGenerateMipmapARB(target);
#endif
#elif defined(GL_EXT_framebuffer_object) #elif defined(GL_EXT_framebuffer_object)
glGenerateMipmapEXT(target); glGenerateMipmapEXT(target);
#else #else
...@@ -2363,7 +2407,7 @@ inline void COpenGLExtensionHandler::extGlProgramParameteri(GLhandleARB program, ...@@ -2363,7 +2407,7 @@ inline void COpenGLExtensionHandler::extGlProgramParameteri(GLhandleARB program,
#elif defined(GL_ARB_geometry_shader4) #elif defined(GL_ARB_geometry_shader4)
glProgramParameteriARB(program, pname, value); glProgramParameteriARB(program, pname, value);
#elif defined(GL_EXT_geometry_shader4) #elif defined(GL_EXT_geometry_shader4)
glProgramParameteriEXT(program, pname, value); glProgramParameteriEXT((long GLuint)program, pname, value);
#elif defined(GL_NV_geometry_program4) || defined(GL_NV_geometry_shader4) #elif defined(GL_NV_geometry_program4) || defined(GL_NV_geometry_shader4)
glProgramParameteriNV(program, pname, value); glProgramParameteriNV(program, pname, value);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment