encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Loko Kung 2022-04-13 19:14:46 +00:00 committed by Dawn LUCI CQ
parent 8b8b641326
commit 83a5d52ed1
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -146,6 +146,7 @@ set_if_not_defined(DAWN_SWIFTSHADER_DIR "${DAWN_THIRD_PARTY_DIR}/swiftshader" "D
set_if_not_defined(DAWN_TINT_DIR "${Dawn_SOURCE_DIR}" "Directory in which to find Tint") 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_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_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 # 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") set_if_not_defined(NODE_ADDON_API_DIR "${DAWN_THIRD_PARTY_DIR}/node-addon-api" "Directory in which to find node-addon-api")

8
src/dawn/native/BUILD.gn
View File

@ -99,9 +99,9 @@ config("vulkan_rpath") {
} }
} }
# Config that adds include directory for vulkan-deps, specifically for Vulkan-Tools. # Config that adds include directory for vulkan-tools.
config("vulkan_deps_include") { config("vulkan_tools_include") {
include_dirs = [ "${dawn_vulkan_deps_dir}" ] include_dirs = [ "${dawn_vulkan_tools_dir}" ]
} }
dawn_json_generator("utils_gen") { dawn_json_generator("utils_gen") {
@ -577,7 +577,7 @@ source_set("sources") {
} }
if (dawn_enable_vulkan) { if (dawn_enable_vulkan) {
configs += [ ":vulkan_deps_include" ] configs += [ ":vulkan_tools_include" ]
deps += [ "${dawn_vulkan_tools_dir}:vulkan_tools_headers" ] deps += [ "${dawn_vulkan_tools_dir}:vulkan_tools_headers" ]
public_deps += [ "${dawn_vulkan_headers_dir}:vulkan_headers" ] public_deps += [ "${dawn_vulkan_headers_dir}:vulkan_headers" ]
sources += [ sources += [

2
src/dawn/native/CMakeLists.txt
View File

@ -516,7 +516,7 @@ if (DAWN_ENABLE_VULKAN)
) )
target_link_libraries(dawn_native PUBLIC Vulkan-Headers) 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) if (UNIX AND NOT APPLE)
target_sources(dawn_native PRIVATE target_sources(dawn_native PRIVATE

2
src/dawn/native/vulkan/CacheKeyVk.h
View File

@ -19,7 +19,7 @@
#include "dawn/common/vulkan_platform.h" #include "dawn/common/vulkan_platform.h"
#include "dawn/native/CacheKey.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> #include <map>