Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-26 07:57:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compile problems on older OpenGL compiled without ext pointers.

Browse Source 
Introduced in r5818. Might be part of the OSX compile troubles.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6125 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-06-19 17:51:23 +00:00
parent ce3e4b0e6e
commit 137c92779e
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/Irrlicht/COpenGLExtensionHandler.h
View File

@ -2867,7 +2867,7 @@ inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLen
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlTextureSubImage2D) if (pGlTextureSubImage2D)
pGlTextureSubImage2D(texture, level, xoffset, yoffset,width, height,format, type, pixels); pGlTextureSubImage2D(texture, level, xoffset, yoffset,width, height,format, type, pixels);
#else #elif defined(GL_VERSION_4_5)
glTextureSubImage2D(texture, level, xoffset, yoffset,width, height,format, type, pixels); glTextureSubImage2D(texture, level, xoffset, yoffset,width, height,format, type, pixels);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
@ -2921,7 +2921,7 @@ inline void COpenGLExtensionHandler::extGlTextureStorage2D(GLuint texture, GLenu
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlTextureStorage2D) if (pGlTextureStorage2D)
pGlTextureStorage2D(texture,levels,internalformat,width,height); pGlTextureStorage2D(texture,levels,internalformat,width,height);
#else #elif defined(GL_VERSION_4_5)
glTextureStorage2D(texture,levels,internalformat,width,height); glTextureStorage2D(texture,levels,internalformat,width,height);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
@ -2934,10 +2934,11 @@ inline void COpenGLExtensionHandler::extGlTextureStorage2D(GLuint texture, GLenu
glTextureStorage2DEXT(texture,target,levels,internalformat,width,height); glTextureStorage2DEXT(texture,target,levels,internalformat,width,height);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
else if (pGlTexStorage2D) #if defined(GL_VERSION_4_2) || defined(_IRR_OPENGL_USE_EXTPOINTER_)
#else
else else
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlTexStorage2D)
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
{ {
GLint bound; GLint bound;
@ -2966,6 +2967,7 @@ inline void COpenGLExtensionHandler::extGlTextureStorage2D(GLuint texture, GLenu
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
glBindTexture(target, bound); glBindTexture(target, bound);
} }
#endif // GL_VERSION_4_2 || _IRR_OPENGL_USE_EXTPOINTER_
} }
inline void COpenGLExtensionHandler::extGlTextureStorage3D(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) inline void COpenGLExtensionHandler::extGlTextureStorage3D(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
@ -2975,7 +2977,7 @@ inline void COpenGLExtensionHandler::extGlTextureStorage3D(GLuint texture, GLenu
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlTextureStorage3D) if (pGlTextureStorage3D)
pGlTextureStorage3D(texture,levels,internalformat,width,height,depth); pGlTextureStorage3D(texture,levels,internalformat,width,height,depth);
#else #elif defined(GL_VERSION_4_5)
glTextureStorage3D(texture,levels,internalformat,width,height,depth); glTextureStorage3D(texture,levels,internalformat,width,height,depth);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
@ -2988,11 +2990,11 @@ inline void COpenGLExtensionHandler::extGlTextureStorage3D(GLuint texture, GLenu
glTextureStorage3DEXT(texture,target,levels,internalformat,width,height,depth); glTextureStorage3DEXT(texture,target,levels,internalformat,width,height,depth);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #if defined(GL_VERSION_4_2) || defined(_IRR_OPENGL_USE_EXTPOINTER_)
else if (pGlTexStorage3D)
#else
else else
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlTexStorage3D)
#endif // _IRR_OPENGL_USE_EX TPOINTER_
{ {
GLint bound; GLint bound;
switch (target) switch (target)
@ -3017,6 +3019,7 @@ inline void COpenGLExtensionHandler::extGlTextureStorage3D(GLuint texture, GLenu
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
glBindTexture(target, bound); glBindTexture(target, bound);
} }
#endif // GL_VERSION_4_2 || _IRR_OPENGL_USE_EXTPOINTER_
} }
inline void COpenGLExtensionHandler::extGlGetTextureImage(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* pixels) inline void COpenGLExtensionHandler::extGlGetTextureImage(GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* pixels)
@ -3064,6 +3067,7 @@ inline void COpenGLExtensionHandler::extGlGetTextureImage(GLuint texture, GLenum
inline void COpenGLExtensionHandler::extGlNamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level) inline void COpenGLExtensionHandler::extGlNamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (!needsDSAFramebufferHack) if (!needsDSAFramebufferHack)
{ {
if (Version>=405 || FeatureAvailable[IRR_ARB_direct_state_access]) if (Version>=405 || FeatureAvailable[IRR_ARB_direct_state_access])
@ -3086,6 +3090,7 @@ inline void COpenGLExtensionHandler::extGlNamedFramebufferTexture(GLuint framebu
pGlFramebufferTexture(GL_FRAMEBUFFER,attachment,texture,level); pGlFramebufferTexture(GL_FRAMEBUFFER,attachment,texture,level);
if (bound!=framebuffer) if (bound!=framebuffer)
pGlBindFramebuffer(GL_FRAMEBUFFER,bound); pGlBindFramebuffer(GL_FRAMEBUFFER,bound);
#endif
} }
inline void COpenGLExtensionHandler::extGlTextureParameteri(GLuint texture, GLenum pname, GLint param) inline void COpenGLExtensionHandler::extGlTextureParameteri(GLuint texture, GLenum pname, GLint param)
@ -3129,7 +3134,7 @@ inline void COpenGLExtensionHandler::extGlCreateTextures(GLenum target, GLsizei
pGlCreateTextures(target,n,textures); pGlCreateTextures(target,n,textures);
else if (textures) else if (textures)
memset(textures,0,n*sizeof(GLuint)); memset(textures,0,n*sizeof(GLuint));
#else #elif defined(GL_VERSION_4_5)
glCreateTextures(target,n,textures); glCreateTextures(target,n,textures);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
@ -3141,6 +3146,7 @@ inline void COpenGLExtensionHandler::extGlCreateTextures(GLenum target, GLsizei
inline void COpenGLExtensionHandler::extGlCreateFramebuffers(GLsizei n, GLuint* framebuffers) inline void COpenGLExtensionHandler::extGlCreateFramebuffers(GLsizei n, GLuint* framebuffers)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (!needsDSAFramebufferHack) if (!needsDSAFramebufferHack)
{ {
if (Version>=405) if (Version>=405)
@ -3151,6 +3157,7 @@ inline void COpenGLExtensionHandler::extGlCreateFramebuffers(GLsizei n, GLuint*
} }
pGlGenFramebuffers(n, framebuffers); pGlGenFramebuffers(n, framebuffers);
#endif
} }
inline void COpenGLExtensionHandler::extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum* targets) inline void COpenGLExtensionHandler::extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum* targets)
@ -3165,7 +3172,7 @@ inline void COpenGLExtensionHandler::extGlBindTextures(GLuint first, GLsizei cou
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlBindTextures) if (pGlBindTextures)
pGlBindTextures(first,count,textures); pGlBindTextures(first,count,textures);
#else #elif defined(GL_VERSION_4_4)
glBindTextures(first,count,textures); glBindTextures(first,count,textures);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
@ -3201,7 +3208,7 @@ inline void COpenGLExtensionHandler::extGlGenerateTextureMipmap(GLuint texture,
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGenerateTextureMipmap) if (pGlGenerateTextureMipmap)
pGlGenerateTextureMipmap(texture); pGlGenerateTextureMipmap(texture);
#else #elif defined(GL_VERSION_4_5)
glGenerateTextureMipmap(texture); glGenerateTextureMipmap(texture);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }