Vulkan: move platform defines to Vulkan Headers build file.

BUILD.gn

@@ -497,28 +497,9 @@ config("libANGLE_config") {
 
 if (angle_enable_vulkan) {
   config("vulkan_config") {
-    if (is_win) {
-      defines = [
-        "VK_USE_PLATFORM_WIN32_KHR",
-        "VK_USE_PLATFORM_WIN32_KHX",
-      ]
-    }
-    if (is_linux) {
-      defines = [
-        "VK_USE_PLATFORM_XCB_KHR",
-        "VK_USE_PLATFORM_XCB_KHX",
-      ]
-    }
     if (is_android) {
-      defines = [
-        "VK_USE_PLATFORM_ANDROID_KHR",
-        "VK_USE_PLATFORM_ANDROID_KHX",
-      ]
       libs = [ "vulkan" ]
     }
-    if (is_fuchsia) {
-      defines = [ "VK_USE_PLATFORM_FUCHSIA" ]
-    }
   }
 
   # Use this target to include everything ANGLE needs for Vulkan.

src/tests/test_utils/third_party/vulkan_command_buffer_utils.h

@@ -40,25 +40,17 @@ ANGLE_DISABLE_EXTRA_SEMI_WARNING
 
 ANGLE_REENABLE_EXTRA_SEMI_WARNING
 
-#if defined(__linux__) && !defined(__ANDROID__)
-#    define VK_USE_PLATFORM_XCB_KHR
-#endif
-
 #ifdef _WIN32
 #    pragma comment(linker, "/subsystem:console")
 #    ifndef WIN32_LEAN_AND_MEAN
 #        define WIN32_LEAN_AND_MEAN
 #    endif
-#    ifndef VK_USE_PLATFORM_WIN32_KHR
-#        define VK_USE_PLATFORM_WIN32_KHR
-#    endif
 #    ifndef NOMINMAX
 #        define NOMINMAX /* Don't let Windows define min() or max() */
 #    endif
 #    define APP_NAME_STR_LEN 80
 #elif defined(__ANDROID__)
 // Include files for Android
-#    define VK_USE_PLATFORM_ANDROID_KHR
 #    include <android/log.h>
 #    include <unistd.h>
 #    include "util/OSWindow.h"

third_party/vulkan-headers/BUILD.gn

@@ -10,6 +10,19 @@ import("../../gni/angle.gni")
 
 config("vulkan_headers_config") {
   include_dirs = [ "src/include" ]
+
+  if (is_win) {
+    defines = [ "VK_USE_PLATFORM_WIN32_KHR" ]
+  }
+  if (is_linux) {
+    defines = [ "VK_USE_PLATFORM_XCB_KHR" ]
+  }
+  if (is_android) {
+    defines = [ "VK_USE_PLATFORM_ANDROID_KHR" ]
+  }
+  if (is_fuchsia) {
+    defines = [ "VK_USE_PLATFORM_FUCHSIA" ]
+  }
 }
 
 # Vulkan headers only, no compiled sources.