Fix incorrect classification of glTexImage3D.

See https://www.khronos.org/bugzilla/show_bug.cgi?id=449 for upstream
bug in gl.spec which incorrectly marks glTexImage3D as deprecated.

Change-Id: Ib307a5315dd37b8b18389df54b1c93e6a43c61dd
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

22 files changed, 122 insertions, 80 deletions

diff --git a/src/gui/opengl/qopenglfunctions_1_2.h b/src/gui/opengl/qopenglfunctions_1_2.h
index b0b06da76e..e646fea703 100644
--- a/src/gui/opengl/qopenglfunctions_1_2.h
+++ b/src/gui/opengl/qopenglfunctions_1_2.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -452,7 +453,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
 private:
     friend class QOpenGLContext;
@@ -803,6 +803,11 @@ inline void QOpenGLFunctions_1_2::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_1_2::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_1_2::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -2344,11 +2349,6 @@ inline void QOpenGLFunctions_1_2::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_1_2::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 
 QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglfunctions_1_3.h b/src/gui/opengl/qopenglfunctions_1_3.h
index 362a60649b..44728a2d18 100644
--- a/src/gui/opengl/qopenglfunctions_1_3.h
+++ b/src/gui/opengl/qopenglfunctions_1_3.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -463,7 +464,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -855,6 +855,11 @@ inline void QOpenGLFunctions_1_3::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_1_3::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_1_3::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -2443,11 +2448,6 @@ inline void QOpenGLFunctions_1_3::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_1_3::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_1_3::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_1_4.h b/src/gui/opengl/qopenglfunctions_1_4.h
index fbb5b2e86c..463927fdaf 100644
--- a/src/gui/opengl/qopenglfunctions_1_4.h
+++ b/src/gui/opengl/qopenglfunctions_1_4.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -472,7 +473,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -906,6 +906,11 @@ inline void QOpenGLFunctions_1_4::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_1_4::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_1_4::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -2531,11 +2536,6 @@ inline void QOpenGLFunctions_1_4::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_1_4::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_1_4::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_1_5.h b/src/gui/opengl/qopenglfunctions_1_5.h
index cdb2140a5c..c50dcabb90 100644
--- a/src/gui/opengl/qopenglfunctions_1_5.h
+++ b/src/gui/opengl/qopenglfunctions_1_5.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -493,7 +494,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -930,6 +930,11 @@ inline void QOpenGLFunctions_1_5::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_1_5::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_1_5::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -2652,11 +2657,6 @@ inline void QOpenGLFunctions_1_5::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_1_5::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_1_5::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_2_0.h b/src/gui/opengl/qopenglfunctions_2_0.h
index afc5eabb38..ee610793ad 100644
--- a/src/gui/opengl/qopenglfunctions_2_0.h
+++ b/src/gui/opengl/qopenglfunctions_2_0.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -552,7 +553,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1029,6 +1029,11 @@ inline void QOpenGLFunctions_2_0::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_2_0::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_2_0::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -3038,11 +3043,6 @@ inline void QOpenGLFunctions_2_0::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_2_0::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_2_0::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_2_1.h b/src/gui/opengl/qopenglfunctions_2_1.h
index c1d291fba4..2dc77cd165 100644
--- a/src/gui/opengl/qopenglfunctions_2_1.h
+++ b/src/gui/opengl/qopenglfunctions_2_1.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -560,7 +561,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1040,6 +1040,11 @@ inline void QOpenGLFunctions_2_1::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_2_1::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_2_1::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -3081,11 +3086,6 @@ inline void QOpenGLFunctions_2_1::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_2_1::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_2_1::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_3_0.h b/src/gui/opengl/qopenglfunctions_3_0.h
index f586bdec58..d6448a08d6 100644
--- a/src/gui/opengl/qopenglfunctions_3_0.h
+++ b/src/gui/opengl/qopenglfunctions_3_0.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -626,7 +627,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1130,6 +1130,11 @@ inline void QOpenGLFunctions_3_0::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_3_0::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_3_0::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -3493,11 +3498,6 @@ inline void QOpenGLFunctions_3_0::glColorTable(GLenum target, GLenum internalfor
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_3_0::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_3_0::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_3_1.h b/src/gui/opengl/qopenglfunctions_3_1.h
index 46beec85e0..b483ac21ad 100644
--- a/src/gui/opengl/qopenglfunctions_3_1.h
+++ b/src/gui/opengl/qopenglfunctions_3_1.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -684,6 +685,11 @@ inline void QOpenGLFunctions_3_1::glTexSubImage3D(GLenum target, GLint level, GL
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_3_1::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_3_1::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h
index f279f1037a..599f493104 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -661,7 +662,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1171,6 +1171,11 @@ inline void QOpenGLFunctions_3_2_Compatibility::glTexSubImage3D(GLenum target, G
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_3_2_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -3693,11 +3698,6 @@ inline void QOpenGLFunctions_3_2_Compatibility::glColorTable(GLenum target, GLen
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_3_2_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.h b/src/gui/opengl/qopenglfunctions_3_2_core.h
index b3d9a5040c..8445384b60 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_core.h
+++ b/src/gui/opengl/qopenglfunctions_3_2_core.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -706,6 +707,11 @@ inline void QOpenGLFunctions_3_2_Core::glTexSubImage3D(GLenum target, GLint leve
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_3_2_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_3_2_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h
index 95e000f88d..6230ebccec 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -721,7 +722,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1234,6 +1234,11 @@ inline void QOpenGLFunctions_3_3_Compatibility::glTexSubImage3D(GLenum target, G
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_3_3_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -4048,11 +4053,6 @@ inline void QOpenGLFunctions_3_3_Compatibility::glColorTable(GLenum target, GLen
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_3_3_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.h b/src/gui/opengl/qopenglfunctions_3_3_core.h
index 0ffb156831..e24c678b9b 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_core.h
+++ b/src/gui/opengl/qopenglfunctions_3_3_core.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -767,6 +768,11 @@ inline void QOpenGLFunctions_3_3_Core::glTexSubImage3D(GLenum target, GLint leve
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_3_3_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_3_3_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h
index a77a2951b1..72e270a1c8 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -769,7 +770,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1285,6 +1285,11 @@ inline void QOpenGLFunctions_4_0_Compatibility::glTexSubImage3D(GLenum target, G
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_0_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -4331,11 +4336,6 @@ inline void QOpenGLFunctions_4_0_Compatibility::glColorTable(GLenum target, GLen
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_4_0_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.h b/src/gui/opengl/qopenglfunctions_4_0_core.h
index 64b75a7374..7d4e468399 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_0_core.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -816,6 +817,11 @@ inline void QOpenGLFunctions_4_0_Core::glTexSubImage3D(GLenum target, GLint leve
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_0_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_0_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h
index 3d7f703b8d..e343d2cba9 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -859,7 +860,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1378,6 +1378,11 @@ inline void QOpenGLFunctions_4_1_Compatibility::glTexSubImage3D(GLenum target, G
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_1_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -4866,11 +4871,6 @@ inline void QOpenGLFunctions_4_1_Compatibility::glColorTable(GLenum target, GLen
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_4_1_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.h b/src/gui/opengl/qopenglfunctions_4_1_core.h
index 90ec87568e..851d80bf36 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_1_core.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -907,6 +908,11 @@ inline void QOpenGLFunctions_4_1_Core::glTexSubImage3D(GLenum target, GLint leve
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_1_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_1_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h
index 65bb26767a..1819c79702 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -873,7 +874,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1395,6 +1395,11 @@ inline void QOpenGLFunctions_4_2_Compatibility::glTexSubImage3D(GLenum target, G
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_2_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -4945,11 +4950,6 @@ inline void QOpenGLFunctions_4_2_Compatibility::glColorTable(GLenum target, GLen
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_4_2_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.h b/src/gui/opengl/qopenglfunctions_4_2_core.h
index 2abe9cb033..dbdaa2996f 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_2_core.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -922,6 +923,11 @@ inline void QOpenGLFunctions_4_2_Core::glTexSubImage3D(GLenum target, GLint leve
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_2_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_2_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h
index 124685d0c0..60be506e6a 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -908,7 +909,6 @@ public:
     void glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
     void glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
     void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.3 deprecated functions
     void glMultTransposeMatrixd(const GLdouble *m);
@@ -1433,6 +1433,11 @@ inline void QOpenGLFunctions_4_3_Compatibility::glTexSubImage3D(GLenum target, G
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_3_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
@@ -5150,11 +5155,6 @@ inline void QOpenGLFunctions_4_3_Compatibility::glColorTable(GLenum target, GLen
     d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
 }
 
-inline void QOpenGLFunctions_4_3_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    d_1_2_Deprecated->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.h b/src/gui/opengl/qopenglfunctions_4_3_core.h
index c004594eb8..f7823cd6aa 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_3_core.h
@@ -139,6 +139,7 @@ public:
     // OpenGL 1.2 core functions
     void glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void glBlendEquation(GLenum mode);
     void glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -958,6 +959,11 @@ inline void QOpenGLFunctions_4_3_Core::glTexSubImage3D(GLenum target, GLint leve
     d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
+inline void QOpenGLFunctions_4_3_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+}
+
 inline void QOpenGLFunctions_4_3_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
     d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
diff --git a/src/gui/opengl/qopenglversionfunctions.cpp b/src/gui/opengl/qopenglversionfunctions.cpp
index d39ecd9d4c..0b1b6834e3 100644
--- a/src/gui/opengl/qopenglversionfunctions.cpp
+++ b/src/gui/opengl/qopenglversionfunctions.cpp
@@ -384,6 +384,7 @@ QOpenGLFunctions_1_2_CoreBackend::QOpenGLFunctions_1_2_CoreBackend(QOpenGLContex
     // OpenGL 1.2 core functions
     CopyTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glCopyTexSubImage3D"));
     TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage3D"));
+    TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
     DrawRangeElements = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint , GLsizei , GLenum , const GLvoid *)>(context->getProcAddress("glDrawRangeElements"));
     BlendEquation = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glBlendEquation"));
     BlendColor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glBlendColor"));
@@ -1593,7 +1594,6 @@ QOpenGLFunctions_1_2_DeprecatedBackend::QOpenGLFunctions_1_2_DeprecatedBackend(Q
     ColorTableParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glColorTableParameteriv"));
     ColorTableParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glColorTableParameterfv"));
     ColorTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glColorTable"));
-    TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
 
 }
 
diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h
index b58a7186d1..833c5adf9f 100644
--- a/src/gui/opengl/qopenglversionfunctions.h
+++ b/src/gui/opengl/qopenglversionfunctions.h
@@ -258,6 +258,7 @@ public:
     // OpenGL 1.2 core functions
     void (QOPENGLF_APIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
     void (QOPENGLF_APIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void (QOPENGLF_APIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
     void (QOPENGLF_APIENTRYP BlendEquation)(GLenum mode);
     void (QOPENGLF_APIENTRYP BlendColor)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
@@ -1171,7 +1172,6 @@ public:
     void (QOPENGLF_APIENTRYP ColorTableParameteriv)(GLenum target, GLenum pname, const GLint *params);
     void (QOPENGLF_APIENTRYP ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat *params);
     void (QOPENGLF_APIENTRYP ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 
 };