BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Fix another compile problem in COpenGLExtensionHandler when compiling older GL versions without extensions.

Browse Source 
Thanks @Maksym Hamarnyk for reporting.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6129 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-06-21 11:26:40 +00:00
parent 340bc7fcbe
commit 2c593614cb
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/Irrlicht/COpenGLExtensionHandler.h
View File

@ -2910,9 +2910,15 @@ inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLen
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound); glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
break; break;
#ifdef GL_VERSION_3_1
case GL_TEXTURE_RECTANGLE: case GL_TEXTURE_RECTANGLE:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound); glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
break; break;
#elif defined(GL_ARB_texture_rectangle)
case GL_TEXTURE_RECTANGLE_ARB:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
break;
#endif
default: default:
return; return;
} }
@ -2967,9 +2973,15 @@ inline void COpenGLExtensionHandler::extGlTextureStorage2D(GLuint texture, GLenu
case GL_TEXTURE_CUBE_MAP: case GL_TEXTURE_CUBE_MAP:
glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound); glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
break; break;
#ifdef GL_VERSION_3_1
case GL_TEXTURE_RECTANGLE: case GL_TEXTURE_RECTANGLE:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound); glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
break; break;
#elif defined(GL_ARB_texture_rectangle)
case GL_TEXTURE_RECTANGLE_ARB:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
break;
#endif
default: default:
return; return;
} }
@ -3206,8 +3218,6 @@ inline void COpenGLExtensionHandler::extGlBindTextures(GLuint first, GLsizei cou
,GL_TEXTURE_RECTANGLE ,GL_TEXTURE_RECTANGLE
#elif defined(GL_ARB_texture_rectangle) #elif defined(GL_ARB_texture_rectangle)
,GL_TEXTURE_RECTANGLE_ARB ,GL_TEXTURE_RECTANGLE_ARB
#elif defined(GL_NV_texture_rectangle)
,GL_TEXTURE_RECTANGLE_NV
#endif #endif
,GL_TEXTURE_CUBE_MAP ,GL_TEXTURE_CUBE_MAP
#ifdef GL_VERSION_3_0 #ifdef GL_VERSION_3_0
@ -3355,9 +3365,15 @@ inline void COpenGLExtensionHandler::extGlGenerateTextureMipmap(GLuint texture,
glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, &bound); glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, &bound);
break; break;
#endif #endif
#ifdef GL_VERSION_3_1
case GL_TEXTURE_RECTANGLE: case GL_TEXTURE_RECTANGLE:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound); glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
break; break;
#elif defined(GL_ARB_texture_rectangle)
case GL_TEXTURE_RECTANGLE_ARB:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
break;
#endif
default: default:
os::Printer::log("DevSH would like to ask you what are you doing!!??\n",ELL_ERROR); os::Printer::log("DevSH would like to ask you what are you doing!!??\n",ELL_ERROR);
return; return;