diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2013-04-04 10:39:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 00:14:53 +0200 |
| commit | ef061b76b1f4eb4e9657933039873221d6380541 (patch) | |
| tree | 803320aa678766d0efb4e206e7acc64dc1f763c3 /src/gui/opengl/qopenglfunctions_1_4.h | |
| parent | 13a3e08c25a79520abdf4852e6e5e0b2122b78b7 (diff) | |
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>
Diffstat (limited to 'src/gui/opengl/qopenglfunctions_1_4.h')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions_1_4.h | 12 |
1 files changed, 6 insertions, 6 deletions
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) |