Vulkan: Add dEQP ES2 expectations.

Only run the info tests for now, skip everything else. Rename angle-vk config to angle-vulkan BUG=angleproject:2161 Change-Id: I0a57f1f8fbfa9d27c2c376d38685184622f0779b Reviewed-on: https://chromium-review.googlesource.com/896552 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Add dEQP ES2 expectations.
c7295f4d · Geoff Lang · Commit Bot · 95ed1947 · c7295f4d · c7295f4d
Commit c7295f4d authored Feb 01, 2018 by Geoff Lang Committed by Commit Bot Feb 02, 2018
4 changed files
--- a/doc/dEQP.md
+++ b/doc/dEQP.md
@@ -39,6 +39,7 @@ ANGLE + dEQP, use the arguments:
  * `--deqp-egl-display-type=angle-d3d11-fl93` for D3D11 Feature level 9_3
  * `--deqp-egl-display-type=angle-gl` for OpenGL Desktop (OSX, Linux and Windows)
  * `--deqp-egl-display-type=angle-gles` for OpenGL ES (Android/ChromeOS, some Windows platforms)
+  * `--deqp-egl-display-type=angle-vulkan` for Vulkan (Android, Linux, Windows)

 ### Check your results


--- a/src/tests/deqp_support/angle_deqp_gtest.cpp
+++ b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -48,9 +48,12 @@ const char *g_TestExpectationsFiles[] = {
 using APIInfo = std::pair<const char *, gpu::GPUTestConfig::API>;

 const APIInfo g_eglDisplayAPIs[] = {
-    { "angle-d3d9", gpu::GPUTestConfig::kAPID3D9 },{ "angle-d3d11", gpu::GPUTestConfig::kAPID3D11 },
-    { "angle-gl", gpu::GPUTestConfig::kAPIGLDesktop },{ "angle-gles", gpu::GPUTestConfig::kAPIGLES },
-    { "angle-null", gpu::GPUTestConfig::kAPIUnknown },{ "angle-vk", gpu::GPUTestConfig::kAPIVulkan },
+    {"angle-d3d9", gpu::GPUTestConfig::kAPID3D9},
+    {"angle-d3d11", gpu::GPUTestConfig::kAPID3D11},
+    {"angle-gl", gpu::GPUTestConfig::kAPIGLDesktop},
+    {"angle-gles", gpu::GPUTestConfig::kAPIGLES},
+    {"angle-null", gpu::GPUTestConfig::kAPIUnknown},
+    {"angle-vulkan", gpu::GPUTestConfig::kAPIVulkan},
 };

 const char *g_deqpEGLString = "--deqp-egl-display-type=";

--- a/src/tests/deqp_support/deqp_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -165,3 +165,33 @@
 1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_short = FAIL
 1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.depth_component_unsigned_int = FAIL
 1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8 = FAIL
+
+// Vulkan failures
+2161 VULKAN : dEQP-GLES2.functional.prerequisite.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.implementation_limits.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.color_clear.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.depth_stencil_clear.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.buffer.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.light_amount.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.shaders.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.texture.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.fragment_ops.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.fbo.* = SKIP
+// Conflicts with Android expectation, specify the OSs
+2161 VULKAN WIN LINUX MAC : dEQP-GLES2.functional.vertex_arrays.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.shader_api.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.negative_api.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.rasterization.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.attribute_location.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.multisample.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.uniform_api.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.read_pixels.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.depth_range.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.dither.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.state_query.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.clipping.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.polygon_offset.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.draw.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.default_vertex_attrib.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.lifetime.* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.debug_marker.* = SKIP
--- a/src/tests/deqp_support/tcuANGLEPlatform.cpp
+++ b/src/tests/deqp_support/tcuANGLEPlatform.cpp
@@ -111,8 +111,8 @@ ANGLEPlatform::ANGLEPlatform()
        vkAttribs.push_back(EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE);
        vkAttribs.push_back(EGL_NONE);

-        auto *vkFactory =
-            new ANGLENativeDisplayFactory("angle-vk", "ANGLE Vulkan Display", vkAttribs, &mEvents);
+        auto *vkFactory = new ANGLENativeDisplayFactory("angle-vulkan", "ANGLE Vulkan Display",
+                                                        vkAttribs, &mEvents);
        m_nativeDisplayFactoryRegistry.registerFactory(vkFactory);
    }
 #endif