purge vestiges of opengl es 1 support

amends 0d5170256c1.

Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

5 files changed, 10 insertions, 43 deletions

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index f083245809..c5262501ac 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -67,14 +67,7 @@ contains(QT_CONFIG, angle) {
         !isEmpty(QMAKE_LIBDIR_EGL): CMAKE_EGL_LIBDIR += $$cmakeTargetPath($$QMAKE_LIBDIR_EGL)
     }
 
-    contains(QT_CONFIG, opengles1) {
-        !isEmpty(QMAKE_INCDIR_OPENGL_ES1): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES1)
-        CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES1)
-        CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES1)
-        !isEmpty(QMAKE_LIBDIR_OPENGL_ES1): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES1)
-        CMAKE_GL_HEADER_NAME = GLES/gl.h
-        CMAKE_QT_OPENGL_IMPLEMENTATION = GLES
-    } else:contains(QT_CONFIG, opengles2) {
+    contains(QT_CONFIG, opengles2) {
         !isEmpty(QMAKE_INCDIR_OPENGL_ES2): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)
         CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)
         CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 55fe036fe0..7a901a2877 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -1030,7 +1030,6 @@ void *QOpenGLContext::openGLModuleHandle()
 
   \value DesktopGL Desktop OpenGL
   \value GLES2 OpenGL ES 2.0 or higher
-  \value GLES1 OpenGL ES 1.x
 
   \since 5.3
 */
@@ -1058,8 +1057,6 @@ QOpenGLContext::OpenGLModuleType QOpenGLContext::openGLModuleType()
     return QGuiApplicationPrivate::instance()->platformIntegration()->openGLModuleType();
 #elif defined(QT_OPENGL_ES_2)
     return GLES2;
-#elif defined(QT_OPENGL_ES)
-    return GLES1;
 #else
     return DesktopGL;
 #endif
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index 06a7b723b4..fce983f975 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -196,8 +196,7 @@ public:
 
     enum OpenGLModuleType {
         DesktopGL,
-        GLES2,
-        GLES1
+        GLES2
     };
 
     static OpenGLModuleType openGLModuleType();
diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp
index 2e1a4577f6..a8a2255104 100644
--- a/src/gui/opengl/qopenglbuffer.cpp
+++ b/src/gui/opengl/qopenglbuffer.cpp
@@ -333,20 +333,18 @@ void QOpenGLBuffer::destroy()
 bool QOpenGLBuffer::read(int offset, void *data, int count)
 {
 #if !defined(QT_OPENGL_ES)
-    if (QOpenGLContext::openGLModuleType() != QOpenGLContext::GLES1) {
-        Q_D(QOpenGLBuffer);
-        if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id())
-            return false;
-        while (d->funcs->glGetError() != GL_NO_ERROR) ; // Clear error state.
-        d->funcs->glGetBufferSubData(d->type, offset, count, data);
-        return d->funcs->glGetError() == GL_NO_ERROR;
-    }
+    Q_D(QOpenGLBuffer);
+    if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id())
+        return false;
+    while (d->funcs->glGetError() != GL_NO_ERROR) ; // Clear error state.
+    d->funcs->glGetBufferSubData(d->type, offset, count, data);
+    return d->funcs->glGetError() == GL_NO_ERROR;
 #else
     Q_UNUSED(offset);
     Q_UNUSED(data);
     Q_UNUSED(count);
-#endif
     return false;
+#endif
 }
 
 /*!
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index ef0ef6d103..eb2c98e1f5 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -256,7 +256,7 @@ QOpenGLExtensions::QOpenGLExtensions(QOpenGLContext *context)
 static int qt_gl_resolve_features()
 {
     QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx->isES() && QOpenGLContext::openGLModuleType() != QOpenGLContext::GLES1) {
+    if (ctx->isES()) {
         // OpenGL ES 2
         int features = QOpenGLFunctions::Multitexture |
             QOpenGLFunctions::Shaders |
@@ -277,26 +277,6 @@ static int qt_gl_resolve_features()
             features |= QOpenGLFunctions::NPOTTextures |
                 QOpenGLFunctions::NPOTTextureRepeat;
         return features;
-    } else if (ctx->isES()) {
-        // OpenGL ES 1
-        int features = QOpenGLFunctions::Multitexture |
-            QOpenGLFunctions::Buffers |
-            QOpenGLFunctions::CompressedTextures |
-            QOpenGLFunctions::Multisample;
-        QOpenGLExtensionMatcher extensions;
-        if (extensions.match("GL_OES_framebuffer_object"))
-            features |= QOpenGLFunctions::Framebuffers;
-        if (extensions.match("GL_OES_blend_equation_separate"))
-            features |= QOpenGLFunctions::BlendEquationSeparate;
-        if (extensions.match("GL_OES_blend_func_separate"))
-            features |= QOpenGLFunctions::BlendFuncSeparate;
-        if (extensions.match("GL_OES_blend_subtract"))
-            features |= QOpenGLFunctions::BlendSubtract;
-        if (extensions.match("GL_OES_texture_npot"))
-            features |= QOpenGLFunctions::NPOTTextures;
-        if (extensions.match("GL_IMG_texture_npot"))
-            features |= QOpenGLFunctions::NPOTTextures;
-        return features;
     } else {
         // OpenGL
         int features = 0;