luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6128 through r6139 from trunk to ogl-es branch.

Browse Source 
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2020-09-29 20:22:28 +00:00
parent 048aa500b9
commit 8b9947f9f6
15 changed files with 107 additions and 75 deletions
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:
glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
break;
#ifdef GL_VERSION_3_1
case GL_TEXTURE_RECTANGLE:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
break;
#elif defined(GL_ARB_texture_rectangle)
case GL_TEXTURE_RECTANGLE_ARB:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
break;
#endif
default:
return;
}
@@ -2967,9 +2973,15 @@ inline void COpenGLExtensionHandler::extGlTextureStorage2D(GLuint texture, GLenu
case GL_TEXTURE_CUBE_MAP:
glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &bound);
break;
#ifdef GL_VERSION_3_1
case GL_TEXTURE_RECTANGLE:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
break;
#elif defined(GL_ARB_texture_rectangle)
case GL_TEXTURE_RECTANGLE_ARB:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
break;
#endif
default:
return;
}
@@ -3206,8 +3218,6 @@ inline void COpenGLExtensionHandler::extGlBindTextures(GLuint first, GLsizei cou
,GL_TEXTURE_RECTANGLE
#elif defined(GL_ARB_texture_rectangle)
,GL_TEXTURE_RECTANGLE_ARB
#elif defined(GL_NV_texture_rectangle)
,GL_TEXTURE_RECTANGLE_NV
#endif
,GL_TEXTURE_CUBE_MAP
#ifdef GL_VERSION_3_0
@@ -3355,9 +3365,15 @@ inline void COpenGLExtensionHandler::extGlGenerateTextureMipmap(GLuint texture,
glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, &bound);
break;
#endif
#ifdef GL_VERSION_3_1
case GL_TEXTURE_RECTANGLE:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE, &bound);
break;
#elif defined(GL_ARB_texture_rectangle)
case GL_TEXTURE_RECTANGLE_ARB:
glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &bound);
break;
#endif
default:
os::Printer::log("DevSH would like to ask you what are you doing!!??\n",ELL_ERROR);
return;