From ef061b76b1f4eb4e9657933039873221d6380541 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Thu, 4 Apr 2013 10:39:36 +0100 Subject: Fix incorrect classification of glTexImage3D. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Samuel Rødal --- src/gui/opengl/qopenglfunctions_1_5.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gui/opengl/qopenglfunctions_1_5.h') 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) -- cgit v1.2.3