From a4ec90175c76ce35688acc06cdf93e9cab886223 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 3 Mar 2014 21:20:30 +0100
Subject: purge vestiges of opengl es 1 support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

amends 0d5170256c1.

Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 src/opengl/opengl.pro       |  1 -
 src/opengl/qglbuffer.cpp    | 16 +++++++---------
 src/opengl/qglfunctions.cpp | 22 +---------------------
 3 files changed, 8 insertions(+), 31 deletions(-)

(limited to 'src/opengl')

diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 4d9208d983..5cd553a5e8 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,7 +11,6 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
 load(qt_module)
 
 contains(QT_CONFIG, opengl):CONFIG += opengl
-contains(QT_CONFIG, opengles1):CONFIG += opengles1
 contains(QT_CONFIG, opengles2):CONFIG += opengles2
 contains(QT_CONFIG, egl):CONFIG += egl
 
diff --git a/src/opengl/qglbuffer.cpp b/src/opengl/qglbuffer.cpp
index 0bcb9d4f1f..1c9545990f 100644
--- a/src/opengl/qglbuffer.cpp
+++ b/src/opengl/qglbuffer.cpp
@@ -344,20 +344,18 @@ void QGLBuffer::destroy()
 bool QGLBuffer::read(int offset, void *data, int count)
 {
 #if !defined(QT_OPENGL_ES)
-    if (QOpenGLContext::openGLModuleType() != QOpenGLContext::GLES1) {
-        Q_D(QGLBuffer);
-        if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id())
-            return false;
-        while (glGetError() != GL_NO_ERROR) ; // Clear error state.
-        d->funcs->glGetBufferSubData(d->type, offset, count, data);
-        return glGetError() == GL_NO_ERROR;
-    }
+    Q_D(QGLBuffer);
+    if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id())
+        return false;
+    while (glGetError() != GL_NO_ERROR) ; // Clear error state.
+    d->funcs->glGetBufferSubData(d->type, offset, count, data);
+    return glGetError() == GL_NO_ERROR;
 #else
     Q_UNUSED(offset);
     Q_UNUSED(data);
     Q_UNUSED(count);
-#endif
     return false;
+#endif
 }
 
 /*!
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp
index d6d77d0568..42b3b47f7f 100644
--- a/src/opengl/qglfunctions.cpp
+++ b/src/opengl/qglfunctions.cpp
@@ -223,7 +223,7 @@ QGLFunctions::QGLFunctions(const QGLContext *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 = QGLFunctions::Multitexture |
             QGLFunctions::Shaders |
@@ -243,26 +243,6 @@ static int qt_gl_resolve_features()
         if (extensions.match("GL_IMG_texture_npot"))
             features |= QGLFunctions::NPOTTextures;
         return features;
-    } else if (ctx->isES()) {
-        // OpenGL ES 1
-        int features = QGLFunctions::Multitexture |
-            QGLFunctions::Buffers |
-            QGLFunctions::CompressedTextures |
-            QGLFunctions::Multisample;
-        QOpenGLExtensionMatcher extensions;
-        if (extensions.match("GL_OES_framebuffer_object"))
-            features |= QGLFunctions::Framebuffers;
-        if (extensions.match("GL_OES_blend_equation_separate"))
-            features |= QGLFunctions::BlendEquationSeparate;
-        if (extensions.match("GL_OES_blend_func_separate"))
-            features |= QGLFunctions::BlendFuncSeparate;
-        if (extensions.match("GL_OES_blend_subtract"))
-            features |= QGLFunctions::BlendSubtract;
-        if (extensions.match("GL_OES_texture_npot"))
-            features |= QGLFunctions::NPOTTextures;
-        if (extensions.match("GL_IMG_texture_npot"))
-            features |= QGLFunctions::NPOTTextures;
-        return features;
     } else {
         // OpenGL
         int features = 0;
-- 
cgit v1.2.3