summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglfunctions_4_1_core.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2013-04-04 10:39:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-05 00:14:53 +0200
commitef061b76b1f4eb4e9657933039873221d6380541 (patch)
tree803320aa678766d0efb4e206e7acc64dc1f763c3 /src/gui/opengl/qopenglfunctions_4_1_core.h
parent13a3e08c25a79520abdf4852e6e5e0b2122b78b7 (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_4_1_core.h')
-rw-r--r--src/gui/opengl/qopenglfunctions_4_1_core.h6
1 files changed, 6 insertions, 0 deletions
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);