Fix issues with config whitelisting.

The Android Shield TV confing was not properly initializing on ES1/Vulkan. Also Ozone configs were failing to initialize ES 3.0 contexts. Bug: angleproject:2286 Bug: chromium:928583 Change-Id: I7e54cdd1bf29791dffee3c70f7ebd3a1283eb5c4 Reviewed-on: https://chromium-review.googlesource.com/c/1453480Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Fix issues with config whitelisting.
d01c504e · Jamie Madill · Commit Bot · 9bb59c5c · d01c504e · d01c504e
Commit d01c504e authored Feb 04, 2019 by Jamie Madill Committed by Commit Bot Feb 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

EGLSanityCheckTest.cpp src/tests/egl_tests/EGLSanityCheckTest.cpp +2 -1

angle_test_instantiate.cpp src/tests/test_utils/angle_test_instantiate.cpp +4 -0

No files found.
--- a/src/tests/egl_tests/EGLSanityCheckTest.cpp
+++ b/src/tests/egl_tests/EGLSanityCheckTest.cpp
@@ -69,7 +69,8 @@ TEST_F(EGLSanityCheckTest, WhitelistMatchesSupport)
    check(ES3_D3D11());
    check(ES31_D3D11());
-    check(ES1_VULKAN());
+    // Has an issue on the Android Shield TV.
+    // check(ES1_VULKAN());
    check(ES2_VULKAN());
    check(ES3_VULKAN());

--- a/src/tests/test_utils/angle_test_instantiate.cpp
+++ b/src/tests/test_utils/angle_test_instantiate.cpp
@@ -213,6 +213,10 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters 
        if (param.driver != GLESDriverType::AngleEGL)
            return false;
+        // ES 3 configs do not work properly on Ozone.
+        if (param.majorVersion > 2)
+            return false;
        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
    }
    else if (IsAndroid())