1 files changed, 16 insertions, 10 deletions

diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 7fa0452fe5..9bc4373860 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -61,6 +61,10 @@
 
 #include <QDebug>
 
+#ifndef QT_OPENGL_ES_2
+#include <QOpenGLFunctions_1_0>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QOpenGLVersionProfilePrivate
@@ -360,13 +364,15 @@ int QOpenGLContextPrivate::maxTextureSize()
     funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
 
 #ifndef QT_OPENGL_ES
-    if (!q->isES()) {
+    if (!q->isOpenGLES()) {
         GLenum proxy = GL_PROXY_TEXTURE_2D;
 
         GLint size;
         GLint next = 64;
         funcs->glTexImage2D(proxy, 0, GL_RGBA, next, next, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &size);
+        QOpenGLFunctions_1_0 *gl1funcs = q->versionFunctions<QOpenGLFunctions_1_0>();
+        gl1funcs->initializeOpenGLFunctions();
+        gl1funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &size);
         if (size == 0) {
             return max_texture_size;
         }
@@ -377,7 +383,7 @@ int QOpenGLContextPrivate::maxTextureSize()
             if (next > max_texture_size)
                 break;
             funcs->glTexImage2D(proxy, 0, GL_RGBA, next, next, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-            funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &next);
+            gl1funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &next);
         } while (next > size);
 
         max_texture_size = size;
@@ -730,7 +736,7 @@ QOpenGLFunctions *QOpenGLContext::functions() const
 QAbstractOpenGLFunctions *QOpenGLContext::versionFunctions(const QOpenGLVersionProfile &versionProfile) const
 {
 #ifndef QT_OPENGL_ES_2
-    if (isES()) {
+    if (isOpenGLES()) {
         qWarning("versionFunctions: Not supported on OpenGL ES");
         return 0;
     }
@@ -1090,8 +1096,8 @@ void *QOpenGLContext::openGLModuleHandle()
   \enum QOpenGLContext::OpenGLModuleType
   This enum defines the type of the underlying OpenGL implementation.
 
-  \value DesktopGL Desktop OpenGL
-  \value GLES2 OpenGL ES 2.0 or higher
+  \value LibGL   OpenGL
+  \value LibGLES OpenGL ES 2.0 or higher
 
   \since 5.3
 */
@@ -1106,7 +1112,7 @@ void *QOpenGLContext::openGLModuleHandle()
   \note A desktop OpenGL implementation may be capable of creating
   ES-compatible contexts too. Therefore in most cases it is more
   appropriate to check QSurfaceFormat::renderableType() or using the
-  the convenience function isES().
+  the convenience function isOpenGLES().
 
   \note This function requires that the QGuiApplication instance is already created.
 
@@ -1118,9 +1124,9 @@ QOpenGLContext::OpenGLModuleType QOpenGLContext::openGLModuleType()
     Q_ASSERT(qGuiApp);
     return QGuiApplicationPrivate::instance()->platformIntegration()->openGLModuleType();
 #elif defined(QT_OPENGL_ES_2)
-    return GLES2;
+    return LibGLES;
 #else
-    return DesktopGL;
+    return LibGL;
 #endif
 }
 
@@ -1134,7 +1140,7 @@ QOpenGLContext::OpenGLModuleType QOpenGLContext::openGLModuleType()
 
   \since 5.3
   */
-bool QOpenGLContext::isES() const
+bool QOpenGLContext::isOpenGLES() const
 {
     return format().renderableType() == QSurfaceFormat::OpenGLES;
 }