Commit 27105857 authored by hybrid's avatar hybrid

Add some default inits for opengl helper functions, as suggested by greenbird

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4264 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 865eee3d
...@@ -1278,6 +1278,8 @@ inline void COpenGLExtensionHandler::extGlClientActiveTexture(GLenum texture) ...@@ -1278,6 +1278,8 @@ inline void COpenGLExtensionHandler::extGlClientActiveTexture(GLenum texture)
inline void COpenGLExtensionHandler::extGlGenPrograms(GLsizei n, GLuint *programs) inline void COpenGLExtensionHandler::extGlGenPrograms(GLsizei n, GLuint *programs)
{ {
if (programs)
memset(programs,0,n*sizeof(GLuint));
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGenProgramsARB) if (pGlGenProgramsARB)
pGlGenProgramsARB(n, programs); pGlGenProgramsARB(n, programs);
...@@ -1348,7 +1350,7 @@ inline void COpenGLExtensionHandler::extGlDeletePrograms(GLsizei n, const GLuint ...@@ -1348,7 +1350,7 @@ inline void COpenGLExtensionHandler::extGlDeletePrograms(GLsizei n, const GLuint
#endif #endif
} }
inline void COpenGLExtensionHandler::extGlProgramLocalParameter4fv(GLenum n, GLuint i, const GLfloat * f) inline void COpenGLExtensionHandler::extGlProgramLocalParameter4fv(GLenum n, GLuint i, const GLfloat *f)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlProgramLocalParameter4fvARB) if (pGlProgramLocalParameter4fvARB)
...@@ -1570,7 +1572,8 @@ inline void COpenGLExtensionHandler::extGlDeleteShader(GLuint shader) ...@@ -1570,7 +1572,8 @@ inline void COpenGLExtensionHandler::extGlDeleteShader(GLuint shader)
inline void COpenGLExtensionHandler::extGlGetAttachedObjects(GLhandleARB program, GLsizei maxcount, GLsizei* count, GLhandleARB* shaders) inline void COpenGLExtensionHandler::extGlGetAttachedObjects(GLhandleARB program, GLsizei maxcount, GLsizei* count, GLhandleARB* shaders)
{ {
*count=0; if (count)
*count=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetAttachedObjectsARB) if (pGlGetAttachedObjectsARB)
pGlGetAttachedObjectsARB(program, maxcount, count, shaders); pGlGetAttachedObjectsARB(program, maxcount, count, shaders);
...@@ -1583,7 +1586,8 @@ inline void COpenGLExtensionHandler::extGlGetAttachedObjects(GLhandleARB program ...@@ -1583,7 +1586,8 @@ inline void COpenGLExtensionHandler::extGlGetAttachedObjects(GLhandleARB program
inline void COpenGLExtensionHandler::extGlGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) inline void COpenGLExtensionHandler::extGlGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
{ {
*count=0; if (count)
*count=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetAttachedShaders) if (pGlGetAttachedShaders)
pGlGetAttachedShaders(program, maxcount, count, shaders); pGlGetAttachedShaders(program, maxcount, count, shaders);
...@@ -1596,6 +1600,8 @@ inline void COpenGLExtensionHandler::extGlGetAttachedShaders(GLuint program, GLs ...@@ -1596,6 +1600,8 @@ inline void COpenGLExtensionHandler::extGlGetAttachedShaders(GLuint program, GLs
inline void COpenGLExtensionHandler::extGlGetInfoLog(GLhandleARB object, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog) inline void COpenGLExtensionHandler::extGlGetInfoLog(GLhandleARB object, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog)
{ {
if (length)
*length=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetInfoLogARB) if (pGlGetInfoLogARB)
pGlGetInfoLogARB(object, maxLength, length, infoLog); pGlGetInfoLogARB(object, maxLength, length, infoLog);
...@@ -1608,6 +1614,8 @@ inline void COpenGLExtensionHandler::extGlGetInfoLog(GLhandleARB object, GLsizei ...@@ -1608,6 +1614,8 @@ inline void COpenGLExtensionHandler::extGlGetInfoLog(GLhandleARB object, GLsizei
inline void COpenGLExtensionHandler::extGlGetShaderInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length, GLchar *infoLog) inline void COpenGLExtensionHandler::extGlGetShaderInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length, GLchar *infoLog)
{ {
if (length)
*length=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetShaderInfoLog) if (pGlGetShaderInfoLog)
pGlGetShaderInfoLog(shader, maxLength, length, infoLog); pGlGetShaderInfoLog(shader, maxLength, length, infoLog);
...@@ -1620,6 +1628,8 @@ inline void COpenGLExtensionHandler::extGlGetShaderInfoLog(GLuint shader, GLsize ...@@ -1620,6 +1628,8 @@ inline void COpenGLExtensionHandler::extGlGetShaderInfoLog(GLuint shader, GLsize
inline void COpenGLExtensionHandler::extGlGetProgramInfoLog(GLuint program, GLsizei maxLength, GLsizei *length, GLchar *infoLog) inline void COpenGLExtensionHandler::extGlGetProgramInfoLog(GLuint program, GLsizei maxLength, GLsizei *length, GLchar *infoLog)
{ {
if (length)
*length=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetProgramInfoLog) if (pGlGetProgramInfoLog)
pGlGetProgramInfoLog(program, maxLength, length, infoLog); pGlGetProgramInfoLog(program, maxLength, length, infoLog);
...@@ -1828,6 +1838,8 @@ inline void COpenGLExtensionHandler::extGlGetActiveUniformARB(GLhandleARB progra ...@@ -1828,6 +1838,8 @@ inline void COpenGLExtensionHandler::extGlGetActiveUniformARB(GLhandleARB progra
GLuint index, GLsizei maxlength, GLsizei *length, GLuint index, GLsizei maxlength, GLsizei *length,
GLint *size, GLenum *type, GLcharARB *name) GLint *size, GLenum *type, GLcharARB *name)
{ {
if (length)
*length=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetActiveUniformARB) if (pGlGetActiveUniformARB)
pGlGetActiveUniformARB(program, index, maxlength, length, size, type, name); pGlGetActiveUniformARB(program, index, maxlength, length, size, type, name);
...@@ -1842,6 +1854,8 @@ inline void COpenGLExtensionHandler::extGlGetActiveUniform(GLuint program, ...@@ -1842,6 +1854,8 @@ inline void COpenGLExtensionHandler::extGlGetActiveUniform(GLuint program,
GLuint index, GLsizei maxlength, GLsizei *length, GLuint index, GLsizei maxlength, GLsizei *length,
GLint *size, GLenum *type, GLchar *name) GLint *size, GLenum *type, GLchar *name)
{ {
if (length)
*length=0;
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetActiveUniform) if (pGlGetActiveUniform)
pGlGetActiveUniform(program, index, maxlength, length, size, type, name); pGlGetActiveUniform(program, index, maxlength, length, size, type, name);
...@@ -1955,6 +1969,8 @@ inline void COpenGLExtensionHandler::extGlDeleteFramebuffers(GLsizei n, const GL ...@@ -1955,6 +1969,8 @@ inline void COpenGLExtensionHandler::extGlDeleteFramebuffers(GLsizei n, const GL
inline void COpenGLExtensionHandler::extGlGenFramebuffers(GLsizei n, GLuint *framebuffers) inline void COpenGLExtensionHandler::extGlGenFramebuffers(GLsizei n, GLuint *framebuffers)
{ {
if (framebuffers)
memset(framebuffers,0,n*sizeof(GLuint));
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGenFramebuffers) if (pGlGenFramebuffers)
pGlGenFramebuffers(n, framebuffers); pGlGenFramebuffers(n, framebuffers);
...@@ -2038,6 +2054,8 @@ inline void COpenGLExtensionHandler::extGlDeleteRenderbuffers(GLsizei n, const G ...@@ -2038,6 +2054,8 @@ inline void COpenGLExtensionHandler::extGlDeleteRenderbuffers(GLsizei n, const G
inline void COpenGLExtensionHandler::extGlGenRenderbuffers(GLsizei n, GLuint *renderbuffers) inline void COpenGLExtensionHandler::extGlGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
{ {
if (renderbuffers)
memset(renderbuffers,0,n*sizeof(GLuint));
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGenRenderbuffers) if (pGlGenRenderbuffers)
pGlGenRenderbuffers(n, renderbuffers); pGlGenRenderbuffers(n, renderbuffers);
...@@ -2131,6 +2149,8 @@ inline void COpenGLExtensionHandler::extGlDrawBuffers(GLsizei n, const GLenum *b ...@@ -2131,6 +2149,8 @@ inline void COpenGLExtensionHandler::extGlDrawBuffers(GLsizei n, const GLenum *b
inline void COpenGLExtensionHandler::extGlGenBuffers(GLsizei n, GLuint *buffers) inline void COpenGLExtensionHandler::extGlGenBuffers(GLsizei n, GLuint *buffers)
{ {
if (buffers)
memset(buffers,0,n*sizeof(GLuint));
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGenBuffersARB) if (pGlGenBuffersARB)
pGlGenBuffersARB(n, buffers); pGlGenBuffersARB(n, buffers);
...@@ -2215,7 +2235,7 @@ inline void *COpenGLExtensionHandler::extGlMapBuffer(GLenum target, GLenum acces ...@@ -2215,7 +2235,7 @@ inline void *COpenGLExtensionHandler::extGlMapBuffer(GLenum target, GLenum acces
#endif #endif
} }
inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer (GLenum target) inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer(GLenum target)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlUnmapBufferARB) if (pGlUnmapBufferARB)
...@@ -2229,7 +2249,7 @@ inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer (GLenum target) ...@@ -2229,7 +2249,7 @@ inline GLboolean COpenGLExtensionHandler::extGlUnmapBuffer (GLenum target)
#endif #endif
} }
inline GLboolean COpenGLExtensionHandler::extGlIsBuffer (GLuint buffer) inline GLboolean COpenGLExtensionHandler::extGlIsBuffer(GLuint buffer)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlIsBufferARB) if (pGlIsBufferARB)
...@@ -2243,7 +2263,7 @@ inline GLboolean COpenGLExtensionHandler::extGlIsBuffer (GLuint buffer) ...@@ -2243,7 +2263,7 @@ inline GLboolean COpenGLExtensionHandler::extGlIsBuffer (GLuint buffer)
#endif #endif
} }
inline void COpenGLExtensionHandler::extGlGetBufferParameteriv (GLenum target, GLenum pname, GLint *params) inline void COpenGLExtensionHandler::extGlGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetBufferParameterivARB) if (pGlGetBufferParameterivARB)
...@@ -2255,7 +2275,7 @@ inline void COpenGLExtensionHandler::extGlGetBufferParameteriv (GLenum target, G ...@@ -2255,7 +2275,7 @@ inline void COpenGLExtensionHandler::extGlGetBufferParameteriv (GLenum target, G
#endif #endif
} }
inline void COpenGLExtensionHandler::extGlGetBufferPointerv (GLenum target, GLenum pname, GLvoid **params) inline void COpenGLExtensionHandler::extGlGetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
{ {
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
if (pGlGetBufferPointervARB) if (pGlGetBufferPointervARB)
...@@ -2564,3 +2584,4 @@ inline void COpenGLExtensionHandler::extGlBlendEquation(GLenum mode) ...@@ -2564,3 +2584,4 @@ inline void COpenGLExtensionHandler::extGlBlendEquation(GLenum mode)
#endif #endif
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment