mirror of
https://github.com/minetest/irrlicht.git
synced 2024-11-20 09:10:25 +01:00
Merging r6117 through r6119 from trunk to ogl-es branch
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:
parent
87c0b1fb93
commit
a471c1ee78
@ -1210,7 +1210,7 @@ class COpenGLExtensionHandler
|
||||
void extGlCreateFramebuffers(GLsizei n, GLuint* framebuffers);
|
||||
void extGlBindTextures(GLuint first, GLsizei count, const GLuint *textures, const GLenum* targets);
|
||||
void extGlGenerateTextureMipmap(GLuint texture, GLenum target);
|
||||
|
||||
|
||||
|
||||
// generic vsync setting method for several extensions
|
||||
void extGlSwapInterval(int interval);
|
||||
@ -2868,7 +2868,7 @@ inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLen
|
||||
if (pGlTextureSubImage2D)
|
||||
pGlTextureSubImage2D(texture, level, xoffset, yoffset,width, height,format, type, pixels);
|
||||
#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_
|
||||
}
|
||||
else if (FeatureAvailable[IRR_EXT_direct_state_access])
|
||||
@ -2877,7 +2877,7 @@ inline void COpenGLExtensionHandler::extGlTextureSubImage2D(GLuint texture, GLen
|
||||
if (pGlTextureSubImage2DEXT)
|
||||
pGlTextureSubImage2DEXT(texture, target, level, xoffset, yoffset,width, height,format, type, pixels);
|
||||
#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_
|
||||
}
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user