Add support for OpenGL ES 3.2 in QOpenGLExtraFunctions

Follow the usual pattern:

Add a config test and automatic include of GLES3/gl32.h if there
is a GLES 3.2 capable header+lib at build time.

Then, regardless of this being enabled, expose all new 3.2 API
functions in QOpenGLExtraFunctions and resolve them dynamically
at run time.

This way 3.2 functions will be available when deployed to a 3.2
capable system (or OpenGL 3/4.x with the functions in question
available) regardless of what was present in the sysroot at build
time.

Change-Id: Ia52551f3178591e1e56ceac8e45d89c6b13f4927
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 1146 insertions, 7 deletions

diff --git a/config.tests/unix/opengles32/opengles32.cpp b/config.tests/unix/opengles32/opengles32.cpp
new file mode 100644
index 0000000000..0505510464
--- /dev/null
+++ b/config.tests/unix/opengles32/opengles32.cpp
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <GLES3/gl32.h>
+
+int main(int, char **)
+{
+    glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
+
+    return 0;
+}
diff --git a/config.tests/unix/opengles32/opengles32.pro b/config.tests/unix/opengles32/opengles32.pro
new file mode 100644
index 0000000000..c95ba83364
--- /dev/null
+++ b/config.tests/unix/opengles32/opengles32.pro
@@ -0,0 +1,7 @@
+# The library is expected to be the same as in ES 2.0 (libGLESv2).
+# The difference is the header and the presence of the functions in
+# the library.
+
+SOURCES = opengles32.cpp
+
+CONFIG -= qt
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 39216ae2b9..f25090ddfd 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -421,6 +421,12 @@
             "test": "unix/opengles31",
             "use": "opengl_es2"
         },
+        "opengles32": {
+            "label": "OpenGL ES 3.2",
+            "type": "compile",
+            "test": "unix/opengles32",
+            "use": "opengl_es2"
+        },
         "qpa_default_platform": {
             "label": "default QPA platform",
             "type": "qpaDefaultPlatform",
@@ -625,6 +631,14 @@
                 { "type": "define", "name": "QT_OPENGL_ES_3_1" }
             ]
         },
+        "opengles32": {
+            "label": "OpenGL ES 3.2",
+            "condition": "features.opengles31 && tests.opengles32",
+            "output": [
+                "publicFeature",
+                { "type": "define", "name": "QT_OPENGL_ES_3_2" }
+            ]
+        },
         "opengl-desktop": {
             "label": "Desktop OpenGL",
             "enable": "input.opengl == 'desktop'",
@@ -1155,7 +1169,8 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
                         },
                         "opengles2",
                         "opengles3",
-                        "opengles31"
+                        "opengles31",
+                        "opengles32"
                     ]
                 },
                 "vulkan",
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index b5df68a3aa..f6c350ba0b 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -101,7 +101,9 @@ typedef void* GLeglImageOES;
 #   define QGL_TEMP_GLEXT_PROTO
 #  endif
 
-#  if defined(QT_OPENGL_ES_3_1)
+#  if defined(QT_OPENGL_ES_3_2)
+#   include <GLES3/gl32.h>
+#  elif defined(QT_OPENGL_ES_3_1)
 #   include <GLES3/gl31.h>
 #  elif defined(QT_OPENGL_ES_3)
 #   include <GLES3/gl3.h>
diff --git a/src/gui/opengl/qopenglextrafunctions.h b/src/gui/opengl/qopenglextrafunctions.h
index 1b36068588..81716fb8d3 100644
--- a/src/gui/opengl/qopenglextrafunctions.h
+++ b/src/gui/opengl/qopenglextrafunctions.h
@@ -52,6 +52,11 @@
 #undef MemoryBarrier
 #endif
 
+// GLES build without having included gl32.h -> GLDEBUGPROC is still need for the protos, define it here
+#if defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_ES_3_2)
+typedef void (QOPENGLF_APIENTRYP  *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QOpenGLExtraFunctionsPrivate;
@@ -230,6 +235,50 @@ class QOpenGLExtraFunctionsPrivate;
 #undef glVertexAttribBinding
 #undef glVertexBindingDivisor
 
+#undef glBlendBarrier
+#undef glCopyImageSubData
+#undef glDebugMessageControl
+#undef glDebugMessageInsert
+#undef glDebugMessageCallback
+#undef glGetDebugMessageLog
+#undef glPushDebugGroup
+#undef glPopDebugGroup
+#undef glObjectLabel
+#undef glGetObjectLabel
+#undef glGetObjectPtrLabel
+#undef glGetPointerv
+#undef glEnablei
+#undef glDisablei
+#undef glBlendEquationi
+#undef glBlendEquationSeparatei
+#undef glBlendFunci
+#undef glBlendFuncSeparatei
+#undef glColorMaski
+#undef glIsEnabledi
+#undef glDrawElementsBaseVertex
+#undef glDrawRangeElementsBaseVertex
+#undef glDrawElementsInstancedBaseVertex
+#undef glFrameBufferTexture
+#undef glPrimitiveBoundingBox
+#undef glGetGraphicsResetStatus
+#undef glReadnPixels
+#undef glGetnUniformfv
+#undef glGetnUniformiv
+#undef glGetnUniformuiv
+#undef glMinSampleShading
+#undef glPatchParameteri
+#undef glTexParameterIiv
+#undef glTexParameterIuiv
+#undef glGetTexParameterIiv
+#undef glGetTexParameterIuiv
+#undef glSamplerParameterIiv
+#undef glSamplerParameterIuiv
+#undef glGetSamplerParameterIiv
+#undef glGetSamplerParameterIuiv
+#undef glTexBuffer
+#undef glTexBufferRange
+#undef glTexStorage3DMultisample
+
 class Q_GUI_EXPORT QOpenGLExtraFunctions : public QOpenGLFunctions
 {
     Q_DECLARE_PRIVATE(QOpenGLExtraFunctions)
@@ -415,6 +464,52 @@ public:
     void glVertexAttribBinding(GLuint attribindex, GLuint bindingindex);
     void glVertexBindingDivisor(GLuint bindingindex, GLuint divisor);
 
+    // GLES 3.2
+    void glBlendBarrier(void);
+    void glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+    void glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+    void glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+    void glDebugMessageCallback(GLDEBUGPROC callback, const void *userParam);
+    GLuint glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+    void glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message);
+    void glPopDebugGroup(void);
+    void glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+    void glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+    void glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label);
+    void glGetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+    void glGetPointerv(GLenum pname, void **params);
+    void glEnablei(GLenum target, GLuint index);
+    void glDisablei(GLenum target, GLuint index);
+    void glBlendEquationi(GLuint buf, GLenum mode);
+    void glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+    void glBlendFunci(GLuint buf, GLenum src, GLenum dst);
+    void glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+    void glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+    GLboolean glIsEnabledi(GLenum target, GLuint index);
+    void glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+    void glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+    void glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+    void glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level);
+    void glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
+    GLenum glGetGraphicsResetStatus(void);
+    void glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+    void glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+    void glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint *params);
+    void glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+    void glMinSampleShading(GLfloat value);
+    void glPatchParameteri(GLenum pname, GLint value);
+    void glTexParameterIiv(GLenum target, GLenum pname, const GLint *params);
+    void glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params);
+    void glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params);
+    void glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params);
+    void glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param);
+    void glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param);
+    void glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params);
+    void glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params);
+    void glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer);
+    void glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+    void glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+
 private:
     static bool isInitialized(const QOpenGLExtraFunctionsPrivate *d) { return d != Q_NULLPTR; }
 };
@@ -615,6 +710,50 @@ public:
     F(void, VertexAttribIFormat, (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \
     F(void, VertexAttribBinding, (GLuint attribindex, GLuint bindingindex)) \
     F(void, VertexBindingDivisor, (GLuint bindingindex, GLuint divisor)) \
+    F(void, BlendBarrier, (void)) \
+    F(void, BlendEquationSeparatei, (GLuint buf, GLenum modeRGB, GLenum modeAlpha)) \
+    F(void, BlendEquationi, (GLuint buf, GLenum mode))              \
+    F(void, BlendFuncSeparatei, (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)) \
+    F(void, BlendFunci, (GLuint buf, GLenum src, GLenum dst)) \
+    F(void, ColorMaski, (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) \
+    F(void, CopyImageSubData, (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)) \
+    F(void, DebugMessageCallback, (GLDEBUGPROC callback, const void * userParam)) \
+    F(void, DebugMessageControl, (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled)) \
+    F(void, DebugMessageInsert, (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf)) \
+    F(void, Disablei, (GLenum target, GLuint index)) \
+    F(void, DrawElementsBaseVertex, (GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex)) \
+    F(void, DrawElementsInstancedBaseVertex, (GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex)) \
+    F(void, DrawRangeElementsBaseVertex, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex)) \
+    F(void, Enablei, (GLenum target, GLuint index)) \
+    F(void, FramebufferTexture, (GLenum target, GLenum attachment, GLuint texture, GLint level)) \
+    F(GLuint, GetDebugMessageLog, (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog)) \
+    F(GLenum, GetGraphicsResetStatus, (void)) \
+    F(void, GetObjectLabel, (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label)) \
+    F(void, GetObjectPtrLabel, (const void * ptr, GLsizei bufSize, GLsizei* length, GLchar* label)) \
+    F(void, GetPointerv, (GLenum pname, void ** params)) \
+    F(void, GetSamplerParameterIiv, (GLuint sampler, GLenum pname, GLint* params)) \
+    F(void, GetSamplerParameterIuiv, (GLuint sampler, GLenum pname, GLuint* params)) \
+    F(void, GetTexParameterIiv, (GLenum target, GLenum pname, GLint* params)) \
+    F(void, GetTexParameterIuiv, (GLenum target, GLenum pname, GLuint* params)) \
+    F(void, GetnUniformfv, (GLuint program, GLint location, GLsizei bufSize, GLfloat* params)) \
+    F(void, GetnUniformiv, (GLuint program, GLint location, GLsizei bufSize, GLint* params)) \
+    F(void, GetnUniformuiv, (GLuint program, GLint location, GLsizei bufSize, GLuint* params)) \
+    F(GLboolean, IsEnabledi, (GLenum target, GLuint index)) \
+    F(void, MinSampleShading, (GLfloat value)) \
+    F(void, ObjectLabel, (GLenum identifier, GLuint name, GLsizei length, const GLchar * label)) \
+    F(void, ObjectPtrLabel, (const void * ptr, GLsizei length, const GLchar * label)) \
+    F(void, PatchParameteri, (GLenum pname, GLint value)) \
+    F(void, PopDebugGroup, (void)) \
+    F(void, PrimitiveBoundingBox, (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW)) \
+    F(void, PushDebugGroup, (GLenum source, GLuint id, GLsizei length, const GLchar * message)) \
+    F(void, ReadnPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data)) \
+    F(void, SamplerParameterIiv, (GLuint sampler, GLenum pname, const GLint * param)) \
+    F(void, SamplerParameterIuiv, (GLuint sampler, GLenum pname, const GLuint * param)) \
+    F(void, TexBuffer, (GLenum target, GLenum internalformat, GLuint buffer)) \
+    F(void, TexBufferRange, (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)) \
+    F(void, TexParameterIiv, (GLenum target, GLenum pname, const GLint * params)) \
+    F(void, TexParameterIuiv, (GLenum target, GLenum pname, const GLuint * params)) \
+    F(void, TexStorage3DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)) \
 
     QT_OPENGL_DECLARE(QT_OPENGL_EXTRA_FUNCTIONS)
 };
@@ -2013,6 +2152,363 @@ inline void QOpenGLExtraFunctions::glVertexBindingDivisor(GLuint bindingindex, G
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
+// GLES 3.2
+
+inline void QOpenGLExtraFunctions::glBlendBarrier()
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.BlendBarrier();
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glBlendEquationi(GLuint buf, GLenum mode)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.BlendEquationi(buf, mode);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.BlendFunci(buf, src, dst);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.ColorMaski(index, r, g, b, a);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDebugMessageCallback(GLDEBUGPROC callback, const void * userParam)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.DebugMessageCallback(callback, userParam);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.DebugMessageControl(source, type, severity, count, ids, enabled);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.DebugMessageInsert(source, type, id, severity, length, buf);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDisablei(GLenum target, GLuint index)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.Disablei(target, index);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glEnablei(GLenum target, GLuint index)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.Enablei(target, index);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.FramebufferTexture(target, attachment, texture, level);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline GLuint QOpenGLExtraFunctions::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    GLuint result = d->f.GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
+    Q_OPENGL_FUNCTIONS_DEBUG
+    return result;
+}
+
+inline GLenum QOpenGLExtraFunctions::glGetGraphicsResetStatus()
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    GLenum result = d->f.GetGraphicsResetStatus();
+    Q_OPENGL_FUNCTIONS_DEBUG
+    return result;
+}
+
+inline void QOpenGLExtraFunctions::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetObjectLabel(identifier, name, bufSize, length, label);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetObjectPtrLabel(const void * ptr, GLsizei bufSize, GLsizei* length, GLchar* label)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetObjectPtrLabel(ptr, bufSize, length, label);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetPointerv(GLenum pname, void ** params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetPointerv(pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetSamplerParameterIiv(sampler, pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetSamplerParameterIuiv(sampler, pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetTexParameterIiv(GLenum target, GLenum pname, GLint* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetTexParameterIiv(target, pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetTexParameterIuiv(target, pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetnUniformfv(program, location, bufSize, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetnUniformiv(program, location, bufSize, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint* params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.GetnUniformuiv(program, location, bufSize, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline GLboolean QOpenGLExtraFunctions::glIsEnabledi(GLenum target, GLuint index)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    GLboolean result = d->f.IsEnabledi(target, index);
+    Q_OPENGL_FUNCTIONS_DEBUG
+    return result;
+}
+
+inline void QOpenGLExtraFunctions::glMinSampleShading(GLfloat value)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.MinSampleShading(value);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar * label)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.ObjectLabel(identifier, name, length, label);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glObjectPtrLabel(const void * ptr, GLsizei length, const GLchar * label)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.ObjectPtrLabel(ptr, length, label);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glPatchParameteri(GLenum pname, GLint value)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.PatchParameteri(pname, value);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glPopDebugGroup()
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.PopDebugGroup();
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.PrimitiveBoundingBox(minX, minY, minZ, minW, maxX, maxY, maxZ, maxW);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar * message)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.PushDebugGroup(source, id, length, message);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.ReadnPixels(x, y, width, height, format, type, bufSize, data);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint * param)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.SamplerParameterIiv(sampler, pname, param);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint * param)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.SamplerParameterIuiv(sampler, pname, param);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.TexBuffer(target, internalformat, buffer);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.TexBufferRange(target, internalformat, buffer, offset, size);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glTexParameterIiv(GLenum target, GLenum pname, const GLint * params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.TexParameterIiv(target, pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint * params)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.TexParameterIuiv(target, pname, params);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
+inline void QOpenGLExtraFunctions::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
+{
+    Q_D(QOpenGLExtraFunctions);
+    Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
+    d->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    Q_OPENGL_FUNCTIONS_DEBUG
+}
+
 QT_END_NAMESPACE
 
 #undef QT_OPENGL_DECLARE_FUNCTIONS
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index e724efab37..17ac249380 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -2213,17 +2213,17 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS)
 
 /*!
     \class QOpenGLExtraFunctions
-    \brief The QOpenGLExtraFunctions class provides cross-platform access to the OpenGL ES 3.0 and 3.1 API.
+    \brief The QOpenGLExtraFunctions class provides cross-platform access to the OpenGL ES 3.0, 3.1 and 3.2 API.
     \since 5.6
     \ingroup painting-3D
     \inmodule QtGui
 
-    This subclass of QOpenGLFunctions includes the OpenGL ES 3.0 and 3.1
-    functions. These will only work when an OpenGL ES 3.0 or 3.1 context, or an
+    This subclass of QOpenGLFunctions includes the OpenGL ES 3.0, 3.1 and 3.2
+    functions. These will only work when an OpenGL ES 3.x context, or an
     OpenGL context of a version containing the functions in question either in
-    core or as extension, is in use. This allows developing GLES 3.0 and 3.1
+    core or as extension, is in use. This allows developing GLES 3.x
     applications in a cross-platform manner: development can happen on a desktop
-    platform with OpenGL 3.x or 4.x, deploying to a real GLES 3.1 device later
+    platform with OpenGL 3.x or 4.x, deploying to a true GLES 3.x device later
     on will require no or minimal changes to the application.
 
     \note This class is different from the versioned OpenGL wrappers, for
@@ -4469,6 +4469,578 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS)
 */
 
 /*!
+    \fn void QOpenGLExtraFunctions::glBlendBarrier()
+
+    Convenience function that calls glBlendBarrier().
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendBarrier.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
+
+    Convenience function that calls glBlendEquationSeparatei(\a buf, \a modeRGB, \a modeAlpha).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendEquationSeparatei.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glBlendEquationi(GLuint buf, GLenum mode)
+
+    Convenience function that calls glBlendEquationi(\a buf, \a mode).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendEquationi.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+
+    Convenience function that calls glBlendFuncSeparatei(\a buf, \a srcRGB, \a dstRGB, \a srcAlpha, \a dstAlpha).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendFuncSeparatei.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
+
+    Convenience function that calls glBlendFunci(\a buf, \a src, \a dst).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendFunci.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+
+    Convenience function that calls glColorMaski(\a index, \a r, \a g, \a b, \a a).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glColorMaski.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
+
+    Convenience function that calls glCopyImageSubData(\a srcName, \a srcTarget, \a srcLevel, \a srcX, \a srcY, \a srcZ, \a dstName, \a dstTarget, \a dstLevel, \a dstX, \a dstY, \a dstZ, \a srcWidth, \a srcHeight, \a srcDepth).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glCopyImageSubData.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDebugMessageCallback(GLDEBUGPROC callback, const void * userParam)
+
+    Convenience function that calls glDebugMessageCallback(\a callback, \a userParam).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDebugMessageCallback.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled)
+
+    Convenience function that calls glDebugMessageControl(\a source, \a type, \a severity, \a count, \a ids, \a enabled).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDebugMessageControl.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf)
+
+    Convenience function that calls glDebugMessageInsert(\a source, \a type, \a id, \a severity, \a length, \a buf).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDebugMessageInsert.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDisablei(GLenum target, GLuint index)
+
+    Convenience function that calls glDisablei(\a target, \a index).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDisablei.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex)
+
+    Convenience function that calls glDrawElementsBaseVertex(\a mode, \a count, \a type, \a indices, \a basevertex).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDrawElementsBaseVertex.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex)
+
+    Convenience function that calls glDrawElementsInstancedBaseVertex(\a mode, \a count, \a type, \a indices, \a instancecount, \a basevertex).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDrawElementsInstancedBaseVertex.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex)
+
+    Convenience function that calls glDrawRangeElementsBaseVertex(\a mode, \a start, \a end, \a count, \a type, \a indices, \a basevertex).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glDrawRangeElementsBaseVertex.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glEnablei(GLenum target, GLuint index)
+
+    Convenience function that calls glEnablei(\a target, \a index).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glEnablei.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
+
+    Convenience function that calls glFramebufferTexture(\a target, \a attachment, \a texture, \a level).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glFramebufferTexture.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog)
+
+    Convenience function that calls glGetDebugMessageLog(\a count, \a bufSize, \a sources, \a types, \a ids, \a severities, \a lengths, \a messageLog).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetDebugMessageLog.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetGraphicsResetStatus()
+
+    Convenience function that calls glGetGraphicsResetStatus().
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetGraphicsResetStatus.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label)
+
+    Convenience function that calls glGetObjectLabel(\a identifier, \a name, \a bufSize, \a length, \a label).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetObjectLabel.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetObjectPtrLabel(const void * ptr, GLsizei bufSize, GLsizei* length, GLchar* label)
+
+    Convenience function that calls glGetObjectPtrLabel(\a ptr, \a bufSize, \a length, \a label).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetObjectPtrLabel.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetPointerv(GLenum pname, void ** params)
+
+    Convenience function that calls glGetPointerv(\a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetPointerv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint* params)
+
+    Convenience function that calls glGetSamplerParameterIiv(\a sampler, \a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetSamplerParameterIiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint* params)
+
+    Convenience function that calls glGetSamplerParameterIuiv(\a sampler, \a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetSamplerParameterIuiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetTexParameterIiv(GLenum target, GLenum pname, GLint* params)
+
+    Convenience function that calls glGetTexParameterIiv(\a target, \a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetTexParameterIiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint* params)
+
+    Convenience function that calls glGetTexParameterIuiv(\a target, \a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetTexParameterIuiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat* params)
+
+    Convenience function that calls glGetnUniformfv(\a program, \a location, \a bufSize, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetnUniformfv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint* params)
+
+    Convenience function that calls glGetnUniformiv(\a program, \a location, \a bufSize, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetnUniformiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint* params)
+
+    Convenience function that calls glGetnUniformuiv(\a program, \a location, \a bufSize, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetnUniformuiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glIsEnabledi(GLenum target, GLuint index)
+
+    Convenience function that calls glIsEnabledi(\a target, \a index).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glIsEnabledi.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glMinSampleShading(GLfloat value)
+
+    Convenience function that calls glMinSampleShading(\a value).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glMinSampleShading.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar * label)
+
+    Convenience function that calls glObjectLabel(\a identifier, \a name, \a length, \a label).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glObjectLabel.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glObjectPtrLabel(const void * ptr, GLsizei length, const GLchar * label)
+
+    Convenience function that calls glObjectPtrLabel(\a ptr, \a length, \a label).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glObjectPtrLabel.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glPatchParameteri(GLenum pname, GLint value)
+
+    Convenience function that calls glPatchParameteri(\a pname, \a value).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glPatchParameteri.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glPopDebugGroup()
+
+    Convenience function that calls glPopDebugGroup().
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glPopDebugGroup.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW)
+
+    Convenience function that calls glPrimitiveBoundingBox(\a minX, \a minY, \a minZ, \a minW, \a maxX, \a maxY, \a maxZ, \a maxW).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glPrimitiveBoundingBox.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar * message)
+
+    Convenience function that calls glPushDebugGroup(\a source, \a id, \a length, \a message).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glPushDebugGroup.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data)
+
+    Convenience function that calls glReadnPixels(\a x, \a y, \a width, \a height, \a format, \a type, \a bufSize, \a data).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glReadnPixels.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint * param)
+
+    Convenience function that calls glSamplerParameterIiv(\a sampler, \a pname, \a param).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glSamplerParameterIiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint * param)
+
+    Convenience function that calls glSamplerParameterIuiv(\a sampler, \a pname, \a param).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glSamplerParameterIuiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
+
+    Convenience function that calls glTexBuffer(\a target, \a internalformat, \a buffer).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexBuffer.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
+
+    Convenience function that calls glTexBufferRange(\a target, \a internalformat, \a buffer, \a offset, \a size).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexBufferRange.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glTexParameterIiv(GLenum target, GLenum pname, const GLint * params)
+
+    Convenience function that calls glTexParameterIiv(\a target, \a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexParameterIiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint * params)
+
+    Convenience function that calls glTexParameterIuiv(\a target, \a pname, \a params).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexParameterIuiv.xml}{${NAME}()}.
+*/
+
+/*!
+    \fn void QOpenGLExtraFunctions::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
+
+    Convenience function that calls glTexStorage3DMultisample(\a target, \a samples, \a internalformat, \a width, \a height, \a depth, \a fixedsamplelocations).
+
+    This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running
+    with plain OpenGL, the function is only usable when the given profile and version contains the
+    function either in core or as an extension.
+
+    For more information, see the OpenGL ES 3.2 documentation for
+    \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexStorage3DMultisample.xml}{${NAME}()}.
+*/
+
+/*!
     \fn bool QOpenGLExtraFunctions::isInitialized(const QOpenGLExtraFunctionsPrivate *d)
     \internal
 */