minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-24 17:50:31 +01:00
Code Issues Projects Releases Wiki Activity

Merging r6117 through r6119 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6120 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-06-13 14:59:16 +00:00
parent 87c0b1fb93
commit a471c1ee78
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Irrlicht/COpenGLExtensionHandler.h
View File

@ -1210,7 +1210,7 @@ class COpenGLExtensionHandler
void extGlCreateFramebuffers(GLsizei n, GLuint* framebuffers); void extGlCreateFramebuffers(GLsizei n, GLuint* framebuffers);
void extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum* targets); void extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum* targets);
void extGlGenerateTextureMipmap(GLuint texture, GLenum target); void extGlGenerateTextureMipmap(GLuint texture, GLenum target);
// generic vsync setting method for several extensions // generic vsync setting method for several extensions
void extGlSwapInterval(int interval); void extGlSwapInterval(int interval);
@ -2868,7 +2868,7 @@ inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLen
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 #else
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_
} }
else if (FeatureAvailable[IRR_EXT_direct_state_access]) else if (FeatureAvailable[IRR_EXT_direct_state_access])
@ -2877,7 +2877,7 @@ inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLen
if (pGlTextureSubImage2DEXT) if (pGlTextureSubImage2DEXT)
pGlTextureSubImage2DEXT(texture, target, level, xoffset, yoffset,width, height,format, type, pixels); pGlTextureSubImage2DEXT(texture, target, level, xoffset, yoffset,width, height,format, type, pixels);
#else #else
glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset,width, height,format, type, pixels)); glTextureSubImage2DEXT(texture, target, level, xoffset, yoffset,width, height,format, type, pixels);
#endif // _IRR_OPENGL_USE_EXTPOINTER_ #endif // _IRR_OPENGL_USE_EXTPOINTER_
} }
else else