Vulkan: Fix build issue in vulkan display/headless backend.

In Linux + Vulkan display/headless backend, angle tests such as angle_unittests/angle_perftests/angle_white_box_perf_tests could not be compiled successfully, fix build issues on vulkan display/headless backend in angle tests. 1. Add EGL_NO_X11 flag into vulkan display/headless backend. 2. Disable angle_white_box_perf_tests on vulkan display/headless backend. Bug: angleproject:5260 Change-Id: I579aee8b0bfaa4c0d7fdf9a6df91c1b78ec4373e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2585256 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Fix build issue in vulkan display/headless backend.
d0f99d54 · Xiaoxuan Liu · Commit Bot · 282fb409 · d0f99d54 · d0f99d54
Commit d0f99d54 authored Dec 03, 2020 by Xiaoxuan Liu Committed by Commit Bot Dec 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

BUILD.gn BUILD.gn +4 -1

BUILD.gn src/tests/BUILD.gn +3 -2

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -128,7 +128,10 @@ config("internal_config") {
  }
  if (angle_use_vulkan_display) {
-    defines += [ "ANGLE_USE_VULKAN_DISPLAY" ]
+    defines += [
+      "ANGLE_USE_VULKAN_DISPLAY",
+      "EGL_NO_X11",
+    ]
    if (angle_vulkan_display_mode == "simple") {
      defines += [ "ANGLE_VULKAN_DISPLAY_MODE_SIMPLE" ]
    } else if (angle_vulkan_display_mode == "headless") {

--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -283,8 +283,9 @@ if (is_win || is_linux || is_chromeos || is_android || is_mac || is_ios) {
    ]
    # These tests depend on vulkan_command_buffer_utils, which is
-    # not yet compatible with mac
+    # not yet compatible with mac and vulkan display/headless backend.
-    if (angle_enable_vulkan && !is_mac && !is_ios) {
+    if (angle_enable_vulkan && !angle_use_vulkan_display && !is_mac &&
+        !is_ios) {
      sources += angle_white_box_perf_tests_vulkan_sources
      deps += [
        "$angle_glslang_dir:glslang_lib_sources",