whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Lars Knoll 2020-10-06 16:29:18 +02:00
parent 417ae745ec
commit bf5d52020b
9 changed files with 0 additions and 1404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/opengl/qopenglfunctions_3_1.h
View File

@ -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);
@ -593,18 +590,6 @@ inline void QOpenGLFunctions_3_1::glCullFace(GLenum mode)
// OpenGL 1.1 core functions
inline void QOpenGLFunctions_3_1::glIndexubv(const GLubyte *c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_1::glIndexub(GLubyte c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline GLboolean QOpenGLFunctions_3_1::glIsTexture(GLuint texture)
{
return d_1_1_Core->f.IsTexture(texture);
@ -660,13 +645,6 @@ inline void QOpenGLFunctions_3_1::glPolygonOffset(GLfloat factor, GLfloat units)
d_1_1_Core->f.PolygonOffset(factor, units);
}
inline void QOpenGLFunctions_3_1::glGetPointerv(GLenum pname, GLvoid* *params)
{
Q_UNUSED(pname);
Q_UNUSED(params);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_1::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
{
d_1_1_Core->f.DrawElements(mode, count, type, indices);

22
src/opengl/qopenglfunctions_3_2_core.h
View File

@ -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);

270
src/opengl/qopenglfunctions_3_3_core.h
View File

@ -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);
@ -676,18 +643,6 @@ inline void QOpenGLFunctions_3_3_Core::glCullFace(GLenum mode)
// OpenGL 1.1 core functions
inline void QOpenGLFunctions_3_3_Core::glIndexubv(const GLubyte *c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glIndexub(GLubyte c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline GLboolean QOpenGLFunctions_3_3_Core::glIsTexture(GLuint texture)
{
return d_1_1_Core->f.IsTexture(texture);
@ -743,13 +698,6 @@ inline void QOpenGLFunctions_3_3_Core::glPolygonOffset(GLfloat factor, GLfloat u
d_1_1_Core->f.PolygonOffset(factor, units);
}
inline void QOpenGLFunctions_3_3_Core::glGetPointerv(GLenum pname, GLvoid* *params)
{
Q_UNUSED(pname);
Q_UNUSED(params);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
{
d_1_1_Core->f.DrawElements(mode, count, type, indices);
@ -1815,224 +1763,6 @@ inline void QOpenGLFunctions_3_3_Core::glVertexAttribP1ui(GLuint index, GLenum t
d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
}
inline void QOpenGLFunctions_3_3_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glSecondaryColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glColorP4uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glColorP4ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glNormalP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glNormalP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP4uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP4ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP2uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP2ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP1uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glTexCoordP1ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glVertexP4uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glVertexP4ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glVertexP3uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glVertexP3ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glVertexP2uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glVertexP2ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_3_3_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
{
d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);

270
src/opengl/qopenglfunctions_4_0_core.h
View File

@ -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);
@ -725,18 +692,6 @@ inline void QOpenGLFunctions_4_0_Core::glCullFace(GLenum mode)
// OpenGL 1.1 core functions
inline void QOpenGLFunctions_4_0_Core::glIndexubv(const GLubyte *c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glIndexub(GLubyte c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline GLboolean QOpenGLFunctions_4_0_Core::glIsTexture(GLuint texture)
{
return d_1_1_Core->f.IsTexture(texture);
@ -792,13 +747,6 @@ inline void QOpenGLFunctions_4_0_Core::glPolygonOffset(GLfloat factor, GLfloat u
d_1_1_Core->f.PolygonOffset(factor, units);
}
inline void QOpenGLFunctions_4_0_Core::glGetPointerv(GLenum pname, GLvoid* *params)
{
Q_UNUSED(pname);
Q_UNUSED(params);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
{
d_1_1_Core->f.DrawElements(mode, count, type, indices);
@ -1864,224 +1812,6 @@ inline void QOpenGLFunctions_4_0_Core::glVertexAttribP1ui(GLuint index, GLenum t
d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
}
inline void QOpenGLFunctions_4_0_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glSecondaryColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glColorP4uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glColorP4ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glNormalP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glNormalP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP4uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP4ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP2uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP2ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP1uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glTexCoordP1ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glVertexP4uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glVertexP4ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glVertexP3uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glVertexP3ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glVertexP2uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glVertexP2ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_0_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
{
d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);

270
src/opengl/qopenglfunctions_4_1_core.h
View File

@ -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);

270
src/opengl/qopenglfunctions_4_2_core.h
View File

@ -125,8 +125,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);
@ -138,7 +136,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);
@ -368,36 +365,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);
@ -837,18 +804,6 @@ inline void QOpenGLFunctions_4_2_Core::glCullFace(GLenum mode)
// OpenGL 1.1 core functions
inline void QOpenGLFunctions_4_2_Core::glIndexubv(const GLubyte *c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glIndexub(GLubyte c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline GLboolean QOpenGLFunctions_4_2_Core::glIsTexture(GLuint texture)
{
return d_1_1_Core->f.IsTexture(texture);
@ -904,13 +859,6 @@ inline void QOpenGLFunctions_4_2_Core::glPolygonOffset(GLfloat factor, GLfloat u
d_1_1_Core->f.PolygonOffset(factor, units);
}
inline void QOpenGLFunctions_4_2_Core::glGetPointerv(GLenum pname, GLvoid* *params)
{
Q_UNUSED(pname);
Q_UNUSED(params);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
{
d_1_1_Core->f.DrawElements(mode, count, type, indices);
@ -1976,224 +1924,6 @@ inline void QOpenGLFunctions_4_2_Core::glVertexAttribP1ui(GLuint index, GLenum t
d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
}
inline void QOpenGLFunctions_4_2_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glSecondaryColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glColorP4uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glColorP4ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glNormalP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glNormalP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP4uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP4ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP2uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP2ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP1uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glTexCoordP1ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glVertexP4uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glVertexP4ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glVertexP3uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glVertexP3ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glVertexP2uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glVertexP2ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_2_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
{
d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);

270
src/opengl/qopenglfunctions_4_3_core.h
View File

@ -126,8 +126,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);
@ -139,7 +137,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);
@ -369,36 +366,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);
@ -874,18 +841,6 @@ inline void QOpenGLFunctions_4_3_Core::glCullFace(GLenum mode)
// OpenGL 1.1 core functions
inline void QOpenGLFunctions_4_3_Core::glIndexubv(const GLubyte *c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glIndexub(GLubyte c)
{
Q_UNUSED(c);
QOPENGL_DEPRECATEDFUNCTION;
}
inline GLboolean QOpenGLFunctions_4_3_Core::glIsTexture(GLuint texture)
{
return d_1_1_Core->f.IsTexture(texture);
@ -941,13 +896,6 @@ inline void QOpenGLFunctions_4_3_Core::glPolygonOffset(GLfloat factor, GLfloat u
d_1_1_Core->f.PolygonOffset(factor, units);
}
inline void QOpenGLFunctions_4_3_Core::glGetPointerv(GLenum pname, GLvoid* *params)
{
Q_UNUSED(pname);
Q_UNUSED(params);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
{
d_1_1_Core->f.DrawElements(mode, count, type, indices);
@ -2013,224 +1961,6 @@ inline void QOpenGLFunctions_4_3_Core::glVertexAttribP1ui(GLuint index, GLenum t
d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
}
inline void QOpenGLFunctions_4_3_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glSecondaryColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glColorP4uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glColorP4ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glColorP3uiv(GLenum type, const GLuint *color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glColorP3ui(GLenum type, GLuint color)
{
Q_UNUSED(type);
Q_UNUSED(color);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glNormalP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glNormalP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
{
Q_UNUSED(texture);
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP4uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP4ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP3uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP3ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP2uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP2ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP1uiv(GLenum type, const GLuint *coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glTexCoordP1ui(GLenum type, GLuint coords)
{
Q_UNUSED(type);
Q_UNUSED(coords);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glVertexP4uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glVertexP4ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glVertexP3uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glVertexP3ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glVertexP2uiv(GLenum type, const GLuint *value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glVertexP2ui(GLenum type, GLuint value)
{
Q_UNUSED(type);
Q_UNUSED(value);
QOPENGL_DEPRECATEDFUNCTION;
}
inline void QOpenGLFunctions_4_3_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
{
d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);

7
src/opengl/qopenglversionfunctions.h
View File

@ -54,9 +54,6 @@
#ifndef QT_NO_OPENGL
#if QT_DEPRECATED_SINCE(5, 6)
#include <QtCore/qhash.h>
#endif
#include <QtCore/qhashfunctions.h>
#include <QtCore/qpair.h>
#include <QtGui/qopengl.h>
@ -77,10 +74,6 @@ class QOpenGLContext;
#pragma qt_sync_stop_processing
#endif
#define QOPENGL_DEPRECATEDFUNCTION \
qFatal("This function was erroneously included in previous versions of Qt and is here only for binary compatibility. " \
"If you need to use this function, please use a legacy OpenGL version or a Compatibility profile.")
struct QOpenGLVersionStatus
{
enum OpenGLStatus {

3
src/opengl/qopenglversionprofile.h
View File

@ -45,9 +45,6 @@
#include <QtGui/QSurfaceFormat>
#include <QtCore/QPair>
#if QT_DEPRECATED_SINCE(5, 6)
#include <QtCore/qhash.h>
#endif
#include <QtCore/qhashfunctions.h>
QT_BEGIN_NAMESPACE