fuchsia: Convert vulkanb headers to DEPS (flutter/engine#28676)

This commit is contained in:
David Worsham 2021-09-16 22:39:06 -07:00 committed by GitHub
parent 6e7589fc42
commit 657b63f499
6 changed files with 22 additions and 8 deletions

6
DEPS
View File

@ -396,10 +396,14 @@ deps = {
'src/third_party/pyyaml':
Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
# Headers for Vulkan 1.1
# Upstream Khronos Vulkan Headers (v1.1.91)
'src/third_party/vulkan':
Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'v1.1.91',
# Downstream Fuchsia Vulkan Headers (v1.2.148)
'src/third_party/fuchsia-vulkan':
Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '651810b2fb877d819feaa00273035bfa16dec94b',
'src/third_party/swiftshader':
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5d1e8540407c138f47028d64684f3da599430aa4',

View File

@ -27,5 +27,8 @@ source_set("graphics") {
"//third_party/skia",
]
public_configs = [ "//flutter:config" ]
public_configs = [
"//flutter:config",
"//flutter/vulkan:vulkan_config",
]
}

View File

@ -80,7 +80,10 @@ source_set("flow") {
"surface_frame.h",
]
public_configs = [ "//flutter:config" ]
public_configs = [
"//flutter:config",
"//flutter/vulkan:vulkan_config",
]
deps = [
"//flutter/common",

View File

@ -128,12 +128,14 @@ source_set("ui") {
public_configs = [ "//flutter:config" ]
public_deps = [ "//flutter/third_party/txt" ]
public_deps = [
"//flutter/flow",
"//flutter/third_party/txt",
]
deps = [
"//flutter/assets",
"//flutter/common",
"//flutter/flow",
"//flutter/fml",
"//flutter/runtime:test_font",
"//flutter/third_party/tonic",

View File

@ -75,7 +75,10 @@ source_set("runtime") {
sources += [ "ptrace_check.cc" ]
}
public_deps = [ "//third_party/rapidjson" ]
public_deps = [
"//flutter/lib/ui",
"//third_party/rapidjson",
]
public_configs = [ "//flutter:config" ]
@ -86,7 +89,6 @@ source_set("runtime") {
"//flutter/flow",
"//flutter/fml",
"//flutter/lib/io",
"//flutter/lib/ui",
"//flutter/third_party/tonic",
"//flutter/third_party/txt",
"//third_party/dart/runtime:dart_api",

View File

@ -8,7 +8,7 @@ config("vulkan_config") {
include_dirs = []
defines = []
if (is_fuchsia) {
include_dirs += [ "$fuchsia_sdk_root/vulkan/include" ]
include_dirs += [ "//third_party/fuchsia-vulkan/include" ]
defines += [ "VK_USE_PLATFORM_FUCHSIA=1" ]
} else {
include_dirs += [