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/qopenglversionfunctions.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/qopenglversionfunctions.h')
| -rw-r--r-- | src/gui/opengl/qopenglversionfunctions.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); }; |