Move ozone detection earlier in white list.

Apparently IsOzone and IsLinux can both be true at the same time. This was confounding the config detection. Bug: angleproject:2286 Bug: chromium:928583 Change-Id: Ifd28242f396fd97447720b0c11caf8c1590f7222 Reviewed-on: https://chromium-review.googlesource.com/c/1454319Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Move ozone detection earlier in white list.
e923a63e · Jamie Madill · Commit Bot · d01c504e · e923a63e
Commit e923a63e authored Feb 05, 2019 by Jamie Madill Committed by Commit Bot Feb 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 19 deletions

angle_test_instantiate.cpp src/tests/test_utils/angle_test_instantiate.cpp +21 -19

No files found.
--- a/src/tests/test_utils/angle_test_instantiate.cpp
+++ b/src/tests/test_utils/angle_test_instantiate.cpp
@@ -173,7 +173,8 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters 
                return false;
        }
    }
-    else if (IsOSX())
+
+    if (IsOSX())
    {
        // Currently we only support the OpenGL back-end on OSX.
        if (param.driver != GLESDriverType::AngleEGL)
@@ -189,7 +190,21 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters 

        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
    }
-    else if (IsLinux())
+
+    if (IsOzone())
+    {
+        // Currently we only support the GLES back-end on Ozone.
+        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);
+    }
+
+    if (IsLinux())
    {
        // Currently we support the OpenGL and Vulkan back-ends on Linux.
        if (param.driver != GLESDriverType::AngleEGL)
@@ -207,19 +222,8 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters 
                return false;
        }
    }
-    else if (IsOzone())
-    {
-        // Currently we only support the GLES back-end on Ozone.
-        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())
+    if (IsAndroid())
    {
        // Currently we support the GLES and Vulkan back-ends on Linux.
        if (param.driver != GLESDriverType::AngleEGL)
@@ -243,11 +247,9 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters 
                return false;
        }
    }
-    else
-    {
-        // Unknown platform.
-        return false;
-    }
+
+    // Unknown platform.
+    return false;
 }

 bool IsConfigSupported(const PlatformParameters &param)