3 files changed, 166 insertions, 145 deletions

diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index 1ec1d88802..57128e4a82 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -49,6 +49,7 @@
 #include <qglframebufferobject.h>
 #include <qglcolormap.h>
 #include <qpaintengine.h>
+#include <qopenglfunctions.h>
 
 #include <QGraphicsView>
 #include <QGraphicsProxyWidget>
@@ -751,7 +752,10 @@ void tst_QGL::openGLVersionCheck()
 #elif defined(QT_OPENGL_ES_2)
     QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
 #else
-    QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_1);
+    if (QOpenGLFunctions::isES())
+        QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
+    else
+        QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_1);
 #endif //defined(QT_OPENGL_ES_1)
 }
 #endif //QT_BUILD_INTERNAL
@@ -1511,12 +1515,6 @@ void tst_QGL::colormap()
     QCOMPARE(cmap4.size(), 256);
 }
 
-#ifndef QT_OPENGL_ES
-#define DEFAULT_FORMAT GL_RGBA8
-#else
-#define DEFAULT_FORMAT GL_RGBA
-#endif
-
 #ifndef GL_TEXTURE_3D
 #define GL_TEXTURE_3D 0x806F
 #endif
@@ -1532,7 +1530,13 @@ void tst_QGL::fboFormat()
     QCOMPARE(format1.samples(), 0);
     QVERIFY(format1.attachment() == QGLFramebufferObject::NoAttachment);
     QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_2D));
-    QCOMPARE(int(format1.internalTextureFormat()), int(DEFAULT_FORMAT));
+    int expectedFormat =
+#ifdef QT_OPENGL_ES_2
+        GL_RGBA;
+#else
+        QOpenGLFunctions::isES() ? GL_RGBA : GL_RGBA8;
+#endif
+    QCOMPARE(int(format1.internalTextureFormat()), expectedFormat);
 
     // Modify the values and re-check.
     format1.setSamples(8);
@@ -1603,14 +1607,26 @@ void tst_QGL::fboFormat()
     QGLFramebufferObjectFormat format4c;
     QVERIFY(format1c == format3c);
     QVERIFY(!(format1c != format3c));
-    format3c.setInternalTextureFormat(DEFAULT_FORMAT);
+    format3c.setInternalTextureFormat(
+#ifdef QT_OPENGL_ES_2
+        GL_RGBA
+#else
+        QOpenGLFunctions::isES() ? GL_RGBA : GL_RGBA8
+#endif
+        );
     QVERIFY(!(format1c == format3c));
     QVERIFY(format1c != format3c);
 
     format4c = format1c;
     QVERIFY(format1c == format4c);
     QVERIFY(!(format1c != format4c));
-    format4c.setInternalTextureFormat(DEFAULT_FORMAT);
+    format4c.setInternalTextureFormat(
+#ifdef QT_OPENGL_ES_2
+        GL_RGBA
+#else
+        QOpenGLFunctions::isES() ? GL_RGBA : GL_RGBA8
+#endif
+        );
     QVERIFY(!(format1c == format4c));
     QVERIFY(format1c != format4c);
 }
diff --git a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
index 975df7f554..fea3c7b643 100644
--- a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
+++ b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
@@ -96,97 +96,99 @@ void tst_QGLFunctions::features()
     funcs.initializeGLFunctions();
 
     // Validate the features against what we expect for this platform.
-#if defined(QT_OPENGL_ES_2)
-    QGLFunctions::OpenGLFeatures allFeatures =
-        (QGLFunctions::Multitexture |
-         QGLFunctions::Shaders |
-         QGLFunctions::Buffers |
-         QGLFunctions::Framebuffers |
-         QGLFunctions::BlendColor |
-         QGLFunctions::BlendEquation |
-         QGLFunctions::BlendEquationSeparate |
-         QGLFunctions::BlendFuncSeparate |
-         QGLFunctions::BlendSubtract |
-         QGLFunctions::CompressedTextures |
-         QGLFunctions::Multisample |
-         QGLFunctions::StencilSeparate |
-         QGLFunctions::NPOTTextures);
-    QVERIFY((funcs.openGLFeatures() & allFeatures) == allFeatures);
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Shaders));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Buffers));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendEquation));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multisample));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures));
-#elif defined(QT_OPENGL_ES)
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Buffers));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
-    QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multisample));
-
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Shaders));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
-
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers),
-             hasExtension("GL_OES_framebuffer_object"));
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate),
-             hasExtension("GL_OES_blend_equation_separate"));
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate),
-             hasExtension("GL_OES_blend_func_separate"));
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract),
-             hasExtension("GL_OES_blend_subtract"));
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures),
-             hasExtension("GL_OES_texture_npot"));
-#else
-    // We check for both the extension name and the minimum OpenGL version
-    // for the feature.  This will help us catch situations where a platform
-    // doesn't list an extension by name but does have the feature by virtue
-    // of its version number.
-    QGLFormat::OpenGLVersionFlags versions = QGLFormat::openGLVersionFlags();
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Multitexture),
-             hasExtension("GL_ARB_multitexture") ||
-             (versions & QGLFormat::OpenGL_Version_1_3) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Shaders),
-             hasExtension("GL_ARB_shader_objects") ||
-             (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Buffers),
-             (versions & QGLFormat::OpenGL_Version_1_5) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers),
-             hasExtension("GL_EXT_framebuffer_object") ||
-             hasExtension("GL_ARB_framebuffer_object"));
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendColor),
-             hasExtension("GL_EXT_blend_color") ||
-             (versions & QGLFormat::OpenGL_Version_1_2) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquation),
-             (versions & QGLFormat::OpenGL_Version_1_2) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate),
-             hasExtension("GL_EXT_blend_equation_separate") ||
-             (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate),
-             hasExtension("GL_EXT_blend_func_separate") ||
-             (versions & QGLFormat::OpenGL_Version_1_4) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract),
-             hasExtension("GL_EXT_blend_subtract"));
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures),
-             hasExtension("GL_ARB_texture_compression") ||
-             (versions & QGLFormat::OpenGL_Version_1_3) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Multisample),
-             hasExtension("GL_ARB_multisample") ||
-             (versions & QGLFormat::OpenGL_Version_1_3) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate),
-             (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-    QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures),
-             hasExtension("GL_ARB_texture_non_power_of_two") ||
-             (versions & QGLFormat::OpenGL_Version_2_0) != 0);
+    if (QOpenGLFunctions::isES()) {
+#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2)
+        QGLFunctions::OpenGLFeatures allFeatures =
+            (QGLFunctions::Multitexture |
+             QGLFunctions::Shaders |
+             QGLFunctions::Buffers |
+             QGLFunctions::Framebuffers |
+             QGLFunctions::BlendColor |
+             QGLFunctions::BlendEquation |
+             QGLFunctions::BlendEquationSeparate |
+             QGLFunctions::BlendFuncSeparate |
+             QGLFunctions::BlendSubtract |
+             QGLFunctions::CompressedTextures |
+             QGLFunctions::Multisample |
+             QGLFunctions::StencilSeparate |
+             QGLFunctions::NPOTTextures);
+        QVERIFY((funcs.openGLFeatures() & allFeatures) == allFeatures);
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Shaders));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Buffers));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendEquation));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multisample));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures));
+#elif defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES_2)
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Buffers));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
+        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multisample));
+
+        QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Shaders));
+        QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
+        QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
+
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers),
+                 hasExtension("GL_OES_framebuffer_object"));
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate),
+                 hasExtension("GL_OES_blend_equation_separate"));
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate),
+                 hasExtension("GL_OES_blend_func_separate"));
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract),
+                 hasExtension("GL_OES_blend_subtract"));
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures),
+                 hasExtension("GL_OES_texture_npot"));
 #endif
+    } else {
+        // We check for both the extension name and the minimum OpenGL version
+        // for the feature.  This will help us catch situations where a platform
+        // doesn't list an extension by name but does have the feature by virtue
+        // of its version number.
+        QGLFormat::OpenGLVersionFlags versions = QGLFormat::openGLVersionFlags();
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Multitexture),
+                 hasExtension("GL_ARB_multitexture") ||
+                 (versions & QGLFormat::OpenGL_Version_1_3) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Shaders),
+                 hasExtension("GL_ARB_shader_objects") ||
+                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Buffers),
+                 (versions & QGLFormat::OpenGL_Version_1_5) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers),
+                 hasExtension("GL_EXT_framebuffer_object") ||
+                 hasExtension("GL_ARB_framebuffer_object"));
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendColor),
+                 hasExtension("GL_EXT_blend_color") ||
+                 (versions & QGLFormat::OpenGL_Version_1_2) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquation),
+                 (versions & QGLFormat::OpenGL_Version_1_2) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate),
+                 hasExtension("GL_EXT_blend_equation_separate") ||
+                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate),
+                 hasExtension("GL_EXT_blend_func_separate") ||
+                 (versions & QGLFormat::OpenGL_Version_1_4) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract),
+                 hasExtension("GL_EXT_blend_subtract"));
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures),
+                 hasExtension("GL_ARB_texture_compression") ||
+                 (versions & QGLFormat::OpenGL_Version_1_3) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Multisample),
+                 hasExtension("GL_ARB_multisample") ||
+                 (versions & QGLFormat::OpenGL_Version_1_3) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate),
+                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
+        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures),
+                 hasExtension("GL_ARB_texture_non_power_of_two") ||
+                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
+    }
 }
 
 // Verify that the multitexture functions appear to resolve and work.
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index f5923764b8..765dc221dc 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -333,52 +333,55 @@ static inline float qrandom() { return (rand() % 100) / 100.f; }
 
 void renderAScene(int w, int h)
 {
-#ifdef QT_OPENGL_ES_2
-            Q_UNUSED(w)
-            Q_UNUSED(h)
-            QGLShaderProgram program;
-            program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec2 pos; void main() { gl_Position = vec4(pos.xy, 1.0, 1.0); }");
-            program.addShaderFromSourceCode(QGLShader::Fragment, "uniform lowp vec4 color; void main() { gl_FragColor = color; }");
-            program.bindAttributeLocation("pos", 0);
-            program.bind();
-
-            glEnableVertexAttribArray(0);
-
-            for (int i=0; i<1000; ++i) {
-                GLfloat pos[] = {
-                    (rand() % 100) / 100.f,
-                    (rand() % 100) / 100.f,
-                    (rand() % 100) / 100.f,
-                    (rand() % 100) / 100.f,
-                    (rand() % 100) / 100.f,
-                    (rand() % 100) / 100.f
-                };
-
-                glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, pos);
-                glDrawArrays(GL_TRIANGLE_STRIP, 0, 3);
-            }
-#else
-            glViewport(0, 0, w, h);
-
-            glMatrixMode(GL_PROJECTION);
-            glLoadIdentity();
-            glFrustum(0, w, h, 0, 1, 100);
-            glTranslated(0, 0, -1);
-
-            glMatrixMode(GL_MODELVIEW);
-            glLoadIdentity();
-
-            for (int i=0;i<1000; ++i) {
-                glBegin(GL_TRIANGLES);
-                glColor3f(qrandom(), qrandom(), qrandom());
-                glVertex2f(qrandom() * w, qrandom() * h);
-                glColor3f(qrandom(), qrandom(), qrandom());
-                glVertex2f(qrandom() * w, qrandom() * h);
-                glColor3f(qrandom(), qrandom(), qrandom());
-                glVertex2f(qrandom() * w, qrandom() * h);
-                glEnd();
-            }
+    if (QOpenGLFunctions::isES()) {
+        QGLFunctions funcs(QGLContext::currentContext());
+        Q_UNUSED(w);
+        Q_UNUSED(h);
+        QGLShaderProgram program;
+        program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec2 pos; void main() { gl_Position = vec4(pos.xy, 1.0, 1.0); }");
+        program.addShaderFromSourceCode(QGLShader::Fragment, "uniform lowp vec4 color; void main() { gl_FragColor = color; }");
+        program.bindAttributeLocation("pos", 0);
+        program.bind();
+
+        funcs.glEnableVertexAttribArray(0);
+
+        for (int i=0; i<1000; ++i) {
+            GLfloat pos[] = {
+                (rand() % 100) / 100.f,
+                (rand() % 100) / 100.f,
+                (rand() % 100) / 100.f,
+                (rand() % 100) / 100.f,
+                (rand() % 100) / 100.f,
+                (rand() % 100) / 100.f
+            };
+
+            funcs.glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, pos);
+            glDrawArrays(GL_TRIANGLE_STRIP, 0, 3);
+        }
+    } else {
+#ifndef QT_OPENGL_ES_2
+        glViewport(0, 0, w, h);
+
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        glFrustum(0, w, h, 0, 1, 100);
+        glTranslated(0, 0, -1);
+
+        glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
+
+        for (int i=0;i<1000; ++i) {
+            glBegin(GL_TRIANGLES);
+            glColor3f(qrandom(), qrandom(), qrandom());
+            glVertex2f(qrandom() * w, qrandom() * h);
+            glColor3f(qrandom(), qrandom(), qrandom());
+            glVertex2f(qrandom() * w, qrandom() * h);
+            glColor3f(qrandom(), qrandom(), qrandom());
+            glVertex2f(qrandom() * w, qrandom() * h);
+            glEnd();
+        }
 #endif
+    }
 }
 
 class ThreadSafeGLWidget : public QGLWidget