Fix tests checking for major version > 3

The tests meant to do getClientMajorVersion() >= 3, but in a few locations accidentally did > 3. Bug: angleproject:3569 Change-Id: Ie69898348982c6aae7dac265a18229c257dbfbda Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1947458Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Fix tests checking for major version > 3
af52f9c6 · Shahbaz Youssefi · Commit Bot · 362168eb · af52f9c6 · af52f9c6
Commit af52f9c6 authored Dec 03, 2019 by Shahbaz Youssefi Committed by Commit Bot Dec 05, 2019
3 changed files
--- a/src/tests/gl_tests/BlendFuncExtendedTest.cpp
+++ b/src/tests/gl_tests/BlendFuncExtendedTest.cpp
@@ -210,7 +210,8 @@ class EXTBlendFuncExtendedDrawTestES3 : public EXTBlendFuncExtendedDrawTest
    void testSetUp() override
    {
        EXTBlendFuncExtendedDrawTest::testSetUp();
-        if (getClientMajorVersion() > 3 || getClientMinorVersion() >= 1)
+        if (getClientMajorVersion() > 3 ||
+            (getClientMajorVersion() == 3 && getClientMinorVersion() >= 1))
        {
            mIsES31OrNewer = true;
        }

--- a/src/tests/gl_tests/MemorySizeTest.cpp
+++ b/src/tests/gl_tests/MemorySizeTest.cpp
@@ -51,7 +51,8 @@ TEST_P(MemorySizeTest, BasicUsageTexture)
    EXPECT_GL_NO_ERROR();
    EXPECT_GT(result, 0);

-    if (getClientMajorVersion() > 3)
+    if (getClientMajorVersion() > 3 ||
+        (getClientMajorVersion() == 3 && getClientMinorVersion() >= 1))
    {
        glGetTexLevelParameteriv(GL_TEXTURE_2D, 1, GL_MEMORY_SIZE_ANGLE, &result);
        EXPECT_GL_NO_ERROR();
@@ -76,7 +77,8 @@ TEST_P(MemorySizeTest, BasicUsageBuffer)
    EXPECT_GL_NO_ERROR();
    EXPECT_EQ(0, result);

-    if (getClientMajorVersion() > 3)
+    if (getClientMajorVersion() > 3 ||
+        (getClientMajorVersion() == 3 && getClientMinorVersion() >= 1))
    {
        GLint64 result64;
        glGetBufferParameteri64v(GL_ARRAY_BUFFER, GL_MEMORY_SIZE_ANGLE, &result64);
@@ -96,7 +98,8 @@ TEST_P(MemorySizeTest, BasicUsageBuffer)

    EXPECT_GT(result, kExpectedMinBufMemorySize);

-    if (getClientMajorVersion() > 3)
+    if (getClientMajorVersion() > 3 ||
+        (getClientMajorVersion() == 3 && getClientMinorVersion() >= 1))
    {
        GLint64 result64;
        glGetBufferParameteri64v(GL_ARRAY_BUFFER, GL_MEMORY_SIZE_ANGLE, &result64);

--- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
@@ -489,14 +489,15 @@ void main()

    constexpr char kFSES3[] =
        R"(#version 300 es
-#extension GL_OES_EGL_image_external : require
+#extension GL_OES_EGL_image_external_essl3 : require
 precision highp float;
 uniform samplerExternalOES sampler;
+out vec4 my_FragColor;
 void main()
 {
-    gl_FragColor = texture(sampler, vec2(0, 0));
+    my_FragColor = texture(sampler, vec2(0, 0));
 })";
-    if (getClientMajorVersion() > 3)
+    if (getClientMajorVersion() >= 3)
    {
        EXPECT_EQ(0u, CompileShader(GL_FRAGMENT_SHADER, kFSES3));
    }
@@ -522,7 +523,7 @@ void main()
        glGetIntegerv(GL_TEXTURE_BINDING_EXTERNAL_OES, &result);
        EXPECT_GL_NO_ERROR();

-        if (getClientMajorVersion() > 3 &&
+        if (getClientMajorVersion() >= 3 &&
            IsGLExtensionRequestable("GL_OES_EGL_image_external_essl3"))
        {
            glRequestExtensionANGLE("GL_OES_EGL_image_external_essl3");