summaryrefslogtreecommitdiffstats
path: root/src/opengl/qopenglfunctions_3_2_core.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-10-06 16:29:18 +0200
committerLars Knoll <lars.knoll@qt.io>2020-10-07 13:54:06 +0200
commitbf5d52020b348d77a8968e39ca36dea7cbcef0e5 (patch)
tree957b78bd362e9785bb8b843a60c8da99f7632a23 /src/opengl/qopenglfunctions_3_2_core.h
parent417ae745ec05c92ee132fb5532e5b3c16e1f2e64 (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_3_2_core.h')
-rw-r--r--src/opengl/qopenglfunctions_3_2_core.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/opengl/qopenglfunctions_3_2_core.h b/src/opengl/qopenglfunctions_3_2_core.h
index bcc07eeca1..543f2ae26b 100644
--- a/src/opengl/qopenglfunctions_3_2_core.h
+++ b/src/opengl/qopenglfunctions_3_2_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);
@@ -615,18 +612,6 @@ inline void QOpenGLFunctions_3_2_Core::glCullFace(GLenum mode)
// OpenGL 1.1 core functions
-inline void QOpenGLFunctions_3_2_Core::glIndexubv(const GLubyte *c)
-{
- Q_UNUSED(c);
- QOPENGL_DEPRECATEDFUNCTION;
-}
-
-inline void QOpenGLFunctions_3_2_Core::glIndexub(GLubyte c)
-{
- Q_UNUSED(c);
- QOPENGL_DEPRECATEDFUNCTION;
-}
-
inline GLboolean QOpenGLFunctions_3_2_Core::glIsTexture(GLuint texture)
{
return d_1_1_Core->f.IsTexture(texture);
@@ -682,13 +667,6 @@ inline void QOpenGLFunctions_3_2_Core::glPolygonOffset(GLfloat factor, GLfloat u
d_1_1_Core->f.PolygonOffset(factor, units);
}
-inline void QOpenGLFunctions_3_2_Core::glGetPointerv(GLenum pname, GLvoid* *params)
-{
- Q_UNUSED(pname);
- Q_UNUSED(params);
- QOPENGL_DEPRECATEDFUNCTION;
-}
-
inline void QOpenGLFunctions_3_2_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
{
d_1_1_Core->f.DrawElements(mode, count, type, indices);