summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglfunctions_3_0.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/opengl/qopenglfunctions_3_0.h')
-rw-r--r--src/gui/opengl/qopenglfunctions_3_0.h12
1 files changed, 6 insertions, 6 deletions
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)