commit 83a5d52ed179564666ab2a294e4f6fb61fbcfcfd
author Loko Kung <lokokung@google.com> Wed Apr 13 19:14:46 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 13 19:14:46 2022 +0000
tree 1f733405e5bb07d497289fea0b30d65b7ef82313
parent 8b8b64132654a579adcc729c990ca989c816f8d7

Changes dependency on vulkan-tools typemap header.

- Changed path to include only vulkan-tools directory to allow for easier configuration in Skia which cannot use vulkan-deps at the moment.

Bug: dawn:1365
Change-Id: Icbd0d3503b4af9d89b23f89c87f18fde814062f6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86582
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Shrek Shao <shrekshao@google.com>
Commit-Queue: Loko Kung <lokokung@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73554e9..6c410a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,6 +146,7 @@
 set_if_not_defined(DAWN_TINT_DIR "${Dawn_SOURCE_DIR}" "Directory in which to find Tint")
 set_if_not_defined(DAWN_VULKAN_DEPS_DIR "${DAWN_THIRD_PARTY_DIR}/vulkan-deps" "Directory in which to find vulkan-deps")
 set_if_not_defined(DAWN_VULKAN_HEADERS_DIR "${DAWN_VULKAN_DEPS_DIR}/vulkan-headers/src" "Directory in which to find Vulkan-Headers")
+set_if_not_defined(DAWN_VULKAN_TOOLS_DIR "${DAWN_VULKAN_DEPS_DIR}/vulkan-tools/src" "Directory in which to find Vulkan-Tools")
 
 # Dependencies for DAWN_BUILD_NODE_BINDINGS
 set_if_not_defined(NODE_ADDON_API_DIR "${DAWN_THIRD_PARTY_DIR}/node-addon-api" "Directory in which to find node-addon-api")

src/dawn/native/BUILD.gn

diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index b15dd8e..7fa3fb4 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -99,9 +99,9 @@
   }
 }
 
-# Config that adds include directory for vulkan-deps, specifically for Vulkan-Tools.
-config("vulkan_deps_include") {
-  include_dirs = [ "${dawn_vulkan_deps_dir}" ]
+# Config that adds include directory for vulkan-tools.
+config("vulkan_tools_include") {
+  include_dirs = [ "${dawn_vulkan_tools_dir}" ]
 }
 
 dawn_json_generator("utils_gen") {
@@ -577,7 +577,7 @@
   }
 
   if (dawn_enable_vulkan) {
-    configs += [ ":vulkan_deps_include" ]
+    configs += [ ":vulkan_tools_include" ]
     deps += [ "${dawn_vulkan_tools_dir}:vulkan_tools_headers" ]
     public_deps += [ "${dawn_vulkan_headers_dir}:vulkan_headers" ]
     sources += [

src/dawn/native/CMakeLists.txt

diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index d695c20..0acb7ba 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -516,7 +516,7 @@
     )
 
     target_link_libraries(dawn_native PUBLIC Vulkan-Headers)
-    target_include_directories(dawn_native PRIVATE ${DAWN_VULKAN_DEPS_DIR})
+    target_include_directories(dawn_native PRIVATE ${DAWN_VULKAN_TOOLS_DIR})
 
     if (UNIX AND NOT APPLE)
         target_sources(dawn_native PRIVATE

src/dawn/native/vulkan/CacheKeyVk.h

diff --git a/src/dawn/native/vulkan/CacheKeyVk.h b/src/dawn/native/vulkan/CacheKeyVk.h
index cae87d6..0142a52 100644
--- a/src/dawn/native/vulkan/CacheKeyVk.h
+++ b/src/dawn/native/vulkan/CacheKeyVk.h
@@ -19,7 +19,7 @@
 #include "dawn/common/vulkan_platform.h"
 #include "dawn/native/CacheKey.h"
 
-#include "vulkan-tools/src/icd/generated/vk_typemap_helper.h"
+#include "icd/generated/vk_typemap_helper.h"
 
 #include <map>