commit c96ef4368489d8b6dc96681d4e5b3fb25b4d8170
author Loko Kung <lokokung@google.com> Sat Apr 02 03:02:40 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Apr 02 03:02:40 2022 +0000
tree b5fbedcd15f20b676dad5c6eda71a638bc2dc010
parent 2a87c84c56a209bfa67f7076c9fd9a65f4344ee0

Updates remainder of references to old vulkan headers and removes them.

Change-Id: I7b0563a9bd3a98c08b81569be04a9c45dbb61f0d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/85420
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>

third_party/CMakeLists.txt

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 136c848..079017e 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -60,19 +60,12 @@
     add_subdirectory(${DAWN_ABSEIL_DIR} "${CMAKE_CURRENT_BINARY_DIR}/abseil")
 endif()
 
+if (NOT TARGET Vulkan-Headers)
+    message(STATUS "Dawn: using Vulkan-Headers at ${DAWN_VULKAN_HEADERS_DIR}")
+    add_subdirectory(${DAWN_VULKAN_HEADERS_DIR} "${CMAKE_CURRENT_BINARY_DIR}/vulkan-headers")
+endif()
+
 # Header-only library for khrplatform.h
 add_library(dawn_khronos_platform INTERFACE)
 target_sources(dawn_khronos_platform INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/khronos/KHR/khrplatform.h")
 target_include_directories(dawn_khronos_platform INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/khronos")
-
-# Header-only library for Vulkan headers
-add_library(dawn_vulkan_headers INTERFACE)
-target_sources(dawn_vulkan_headers INTERFACE
-    "${CMAKE_CURRENT_SOURCE_DIR}/khronos/vulkan/vk_icd.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/khronos/vulkan/vk_layer.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/khronos/vulkan/vk_platform.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/khronos/vulkan/vk_sdk_platform.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/khronos/vulkan/vulkan.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/khronos/vulkan/vulkan_core.h"
-)
-target_include_directories(dawn_vulkan_headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/khronos")