Default deqp to Vulkan on !Apple

To avoid having to specify --use-angle=vulkan every time. Particularly useful for running deqp tests on Android through renderdoc as setting more-than-one command line argument is impossible. Bug: angleproject:3647 Change-Id: I5ed6ec8fc4febc7f0febe0922a121b26df5581f9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2544906Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Default deqp to Vulkan on !Apple
7c66cdf8 · Shahbaz Youssefi · Commit Bot · bacb8dfc · 7c66cdf8
Commit 7c66cdf8 authored Nov 17, 2020 by Shahbaz Youssefi Committed by Commit Bot Nov 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

angle_deqp_gtest.cpp src/tests/deqp_support/angle_deqp_gtest.cpp +4 -5

No files found.
--- a/src/tests/deqp_support/angle_deqp_gtest.cpp
+++ b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -140,12 +140,11 @@ const char *gEGLConfigName = "rgba8888d24s8";
 // Returns the default API for a platform.
 const char *GetDefaultAPIName()
 {
-#if defined(ANGLE_PLATFORM_WINDOWS)
-    return "angle-d3d11";
-#elif defined(ANGLE_PLATFORM_APPLE) || defined(ANGLE_PLATFORM_LINUX)
+#if defined(ANGLE_PLATFORM_ANDROID) || defined(ANGLE_PLATFORM_LINUX) || \
+    defined(ANGLE_PLATFORM_WINDOWS)
+    return "angle-vulkan";
+#elif defined(ANGLE_PLATFORM_APPLE)
    return "angle-gl";
-#elif defined(ANGLE_PLATFORM_ANDROID)
-    return "angle-gles";
 #else
 #    error Unknown platform.
 #endif