Vulkan: ES3 dEQP suppressions

BUILD.gn

@@ -101,6 +101,9 @@ config("internal_config") {
     if (angle_enable_vulkan_gpu_trace_events) {
       defines += [ "ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS=1" ]
     }
+    if (angle_vulkan_conformant_configs_only) {
+      defines += [ "ANGLE_VULKAN_CONFORMANT_CONFIGS_ONLY=1" ]
+    }
   }
 
   if (angle_enable_trace) {

gni/angle.gni

@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build_overrides/angle.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")  # import the use_x11 variable
+import("//build_overrides/angle.gni")
 import("//build_overrides/build.gni")
 import("//testing/test.gni")
 if (is_android) {
@@ -81,6 +81,9 @@ declare_args() {
   if (angle_enable_vulkan) {
     # Enable Vulkan GPU trace event capability
     angle_enable_vulkan_gpu_trace_events = false
+
+    # Disallow non-conformant configurations
+    angle_vulkan_conformant_configs_only = false
   }
 }
 

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1126,8 +1126,12 @@ std::string RendererVk::getRendererDescription() const
 gl::Version RendererVk::getMaxSupportedESVersion() const
 {
     // Current highest supported version
-    // TODO: Update this to support ES 3.0. http://crbug.com/angleproject/2950
-    gl::Version maxVersion = gl::Version(2, 0);
+    gl::Version maxVersion = gl::Version(3, 0);
+
+#if ANGLE_VULKAN_CONFORMANT_CONFIGS_ONLY
+    // TODO: Disallow ES 3.0 until supported. http://crbug.com/angleproject/2950
+    maxVersion = gl::Version(2, 0);
+#endif
 
     // Vulkan inherited queries are required to support any GL query type
     if (!mPhysicalDeviceFeatures.inheritedQueries)

src/tests/test_utils/angle_test_instantiate.cpp

@@ -144,11 +144,13 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters
             return true;
     }
 
+#if ANGLE_VULKAN_CONFORMANT_CONFIGS_ONLY
     // Vulkan ES 3.0 is not yet supported.
     if (param.majorVersion > 2 && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
     {
         return false;
     }
+#endif
 
     if (IsWindows())
     {