diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-10-06 16:29:18 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-07 13:54:06 +0200 |
commit | bf5d52020b348d77a8968e39ca36dea7cbcef0e5 (patch) | |
tree | 957b78bd362e9785bb8b843a60c8da99f7632a23 /src/opengl/qopenglfunctions_4_1_core.h | |
parent | 417ae745ec05c92ee132fb5532e5b3c16e1f2e64 (diff) |
Remove methods that shouldn't be in the OpenGL wrappers
Those methods where only kept for BC in Qt 5.x, but were actually
asserting at runtime. Get rid of them.
Fixes: QTBUG-86475
Change-Id: I19e6e4ada22b6a4427a2cb13962792c5a3b461af
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/opengl/qopenglfunctions_4_1_core.h')
-rw-r--r-- | src/opengl/qopenglfunctions_4_1_core.h | 270 |
1 files changed, 0 insertions, 270 deletions
diff --git a/src/opengl/qopenglfunctions_4_1_core.h b/src/opengl/qopenglfunctions_4_1_core.h index 8c2f5bce3e..c1862357bd 100644 --- a/src/opengl/qopenglfunctions_4_1_core.h +++ b/src/opengl/qopenglfunctions_4_1_core.h @@ -119,8 +119,6 @@ public: void glCullFace(GLenum mode); // OpenGL 1.1 core functions - void glIndexubv(const GLubyte *c); - void glIndexub(GLubyte c); GLboolean glIsTexture(GLuint texture); void glGenTextures(GLsizei n, GLuint *textures); void glDeleteTextures(GLsizei n, const GLuint *textures); @@ -132,7 +130,6 @@ public: void glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); void glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); void glPolygonOffset(GLfloat factor, GLfloat units); - void glGetPointerv(GLenum pname, GLvoid* *params); void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); void glDrawArrays(GLenum mode, GLint first, GLsizei count); @@ -362,36 +359,6 @@ public: void glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value); void glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value); void glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value); - void glSecondaryColorP3uiv(GLenum type, const GLuint *color); - void glSecondaryColorP3ui(GLenum type, GLuint color); - void glColorP4uiv(GLenum type, const GLuint *color); - void glColorP4ui(GLenum type, GLuint color); - void glColorP3uiv(GLenum type, const GLuint *color); - void glColorP3ui(GLenum type, GLuint color); - void glNormalP3uiv(GLenum type, const GLuint *coords); - void glNormalP3ui(GLenum type, GLuint coords); - void glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords); - void glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords); - void glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords); - void glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords); - void glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords); - void glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords); - void glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords); - void glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords); - void glTexCoordP4uiv(GLenum type, const GLuint *coords); - void glTexCoordP4ui(GLenum type, GLuint coords); - void glTexCoordP3uiv(GLenum type, const GLuint *coords); - void glTexCoordP3ui(GLenum type, GLuint coords); - void glTexCoordP2uiv(GLenum type, const GLuint *coords); - void glTexCoordP2ui(GLenum type, GLuint coords); - void glTexCoordP1uiv(GLenum type, const GLuint *coords); - void glTexCoordP1ui(GLenum type, GLuint coords); - void glVertexP4uiv(GLenum type, const GLuint *value); - void glVertexP4ui(GLenum type, GLuint value); - void glVertexP3uiv(GLenum type, const GLuint *value); - void glVertexP3ui(GLenum type, GLuint value); - void glVertexP2uiv(GLenum type, const GLuint *value); - void glVertexP2ui(GLenum type, GLuint value); void glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params); void glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params); void glQueryCounter(GLuint id, GLenum target); @@ -816,18 +783,6 @@ inline void QOpenGLFunctions_4_1_Core::glCullFace(GLenum mode) // OpenGL 1.1 core functions -inline void QOpenGLFunctions_4_1_Core::glIndexubv(const GLubyte *c) -{ - Q_UNUSED(c); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glIndexub(GLubyte c) -{ - Q_UNUSED(c); - QOPENGL_DEPRECATEDFUNCTION; -} - inline GLboolean QOpenGLFunctions_4_1_Core::glIsTexture(GLuint texture) { return d_1_1_Core->f.IsTexture(texture); @@ -883,13 +838,6 @@ inline void QOpenGLFunctions_4_1_Core::glPolygonOffset(GLfloat factor, GLfloat u d_1_1_Core->f.PolygonOffset(factor, units); } -inline void QOpenGLFunctions_4_1_Core::glGetPointerv(GLenum pname, GLvoid* *params) -{ - Q_UNUSED(pname); - Q_UNUSED(params); - QOPENGL_DEPRECATEDFUNCTION; -} - inline void QOpenGLFunctions_4_1_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) { d_1_1_Core->f.DrawElements(mode, count, type, indices); @@ -1955,224 +1903,6 @@ inline void QOpenGLFunctions_4_1_Core::glVertexAttribP1ui(GLuint index, GLenum t d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value); } -inline void QOpenGLFunctions_4_1_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color) -{ - Q_UNUSED(type); - Q_UNUSED(color); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glSecondaryColorP3ui(GLenum type, GLuint color) -{ - Q_UNUSED(type); - Q_UNUSED(color); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glColorP4uiv(GLenum type, const GLuint *color) -{ - Q_UNUSED(type); - Q_UNUSED(color); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glColorP4ui(GLenum type, GLuint color) -{ - Q_UNUSED(type); - Q_UNUSED(color); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glColorP3uiv(GLenum type, const GLuint *color) -{ - Q_UNUSED(type); - Q_UNUSED(color); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glColorP3ui(GLenum type, GLuint color) -{ - Q_UNUSED(type); - Q_UNUSED(color); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glNormalP3uiv(GLenum type, const GLuint *coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glNormalP3ui(GLenum type, GLuint coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords) -{ - Q_UNUSED(texture); - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP4uiv(GLenum type, const GLuint *coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP4ui(GLenum type, GLuint coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP3uiv(GLenum type, const GLuint *coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP3ui(GLenum type, GLuint coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP2uiv(GLenum type, const GLuint *coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP2ui(GLenum type, GLuint coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP1uiv(GLenum type, const GLuint *coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glTexCoordP1ui(GLenum type, GLuint coords) -{ - Q_UNUSED(type); - Q_UNUSED(coords); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glVertexP4uiv(GLenum type, const GLuint *value) -{ - Q_UNUSED(type); - Q_UNUSED(value); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glVertexP4ui(GLenum type, GLuint value) -{ - Q_UNUSED(type); - Q_UNUSED(value); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glVertexP3uiv(GLenum type, const GLuint *value) -{ - Q_UNUSED(type); - Q_UNUSED(value); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glVertexP3ui(GLenum type, GLuint value) -{ - Q_UNUSED(type); - Q_UNUSED(value); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glVertexP2uiv(GLenum type, const GLuint *value) -{ - Q_UNUSED(type); - Q_UNUSED(value); - QOPENGL_DEPRECATEDFUNCTION; -} - -inline void QOpenGLFunctions_4_1_Core::glVertexP2ui(GLenum type, GLuint value) -{ - Q_UNUSED(type); - Q_UNUSED(value); - QOPENGL_DEPRECATEDFUNCTION; -} - inline void QOpenGLFunctions_4_1_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params) { d_3_3_Core->f.GetQueryObjectui64v(id, pname, params); |