Skip to content

Commit

Permalink
Move vulkan-deps to //flutter/third_party/vulkan-deps
Browse files Browse the repository at this point in the history 
See flutter/flutter#144205
  • Loading branch information
@jason-simmons
jason-simmons committed Feb 27, 2024
1 parent 6f7b939 commit d0110d9
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 25 deletions.
6 changes: 3 additions & 3 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '21b1b9f2645fada701885108e86aefbcb3b1cca0',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '2f684abc6e6bfba9062bd372929a8d458e03940a',

'src/flutter/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
Expand All @@ -302,7 +302,7 @@ deps = {
'src/flutter/third_party/shaderc':
Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',

'src/third_party/vulkan-deps':
'src/flutter/third_party/vulkan-deps':
Var('chromium_git') + '/vulkan-deps' + '@' + '014f44e134a1de387791bffacc32ff9d8db71176',

'src/flutter/third_party/flatbuffers':
Expand Down Expand Up @@ -1063,7 +1063,7 @@ deps = {
}

recursedeps = [
'src/third_party/vulkan-deps',
'src/flutter/third_party/vulkan-deps',
]

hooks = [
Expand Down
12 changes: 6 additions & 6 deletions build/secondary/third_party/shaderc_flutter/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ source_set("shaderc_util_flutter") {
public_configs = [ ":shaderc_util_config" ]

configs +=
[ "//third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
[ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]

public_deps = [
"//third_party/vulkan-deps/glslang/src:glslang_sources",
"//third_party/vulkan-deps/spirv-tools/src:spvtools",
"//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
"//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools",
]

defines = [ "ENABLE_HLSL=1" ]
Expand Down Expand Up @@ -62,13 +62,13 @@ source_set("shaderc_flutter") {
public_configs = [ ":shaderc_config" ]

configs +=
[ "//third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
[ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]

deps = [ ":shaderc_util_flutter" ]

public_deps = [
"//third_party/vulkan-deps/glslang/src:glslang_sources",
"//third_party/vulkan-deps/spirv-tools/src:spvtools",
"//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
"//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools",
]

sources = [
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/spirv_cross_flutter/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

source_root = "//third_party/vulkan-deps/spirv-cross/src"
source_root = "//flutter/third_party/vulkan-deps/spirv-cross/src"

config("spirv_cross_public") {
include_dirs = [ source_root ]
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/vulkan_memory_allocator/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Custom GN integration for VulkanMemoryAllocator.

declare_args() {
vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
vma_vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
}

config("vulkan_memory_allocator_config") {
Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/vulkan_validation_layers/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import("//build_overrides/vulkan_validation_layers.gni")

_checkout_dir = "//third_party/vulkan-deps/vulkan-validation-layers/src"
_checkout_dir = "//flutter/third_party/vulkan-deps/vulkan-validation-layers/src"

vulkan_undefine_configs = []
if (is_win) {
Expand Down
5 changes: 3 additions & 2 deletions common/graphics/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ source_set("graphics") {

public_configs = [ "//flutter:config" ]
if (shell_enable_vulkan) {
public_deps =
[ "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
public_deps = [
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
]
}
}
2 changes: 1 addition & 1 deletion examples/vulkan_glfw/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ executable("vulkan_glfw") {
deps = [
"//flutter/shell/platform/embedder:embedder",
"//flutter/third_party/glfw",
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
]
}
2 changes: 1 addition & 1 deletion flutter_vma/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ source_set("flutter_vma") {

public_deps = [
"//flutter/fml",
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//third_party/vulkan_memory_allocator",
]

Expand Down
2 changes: 1 addition & 1 deletion impeller/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impeller_component("impeller_unittests") {
if (glfw_vulkan_library != "") {
deps += [
"//flutter/third_party/swiftshader",
"//third_party/vulkan-deps/vulkan-loader/src:libvulkan",
"//flutter/third_party/vulkan-deps/vulkan-loader/src:libvulkan",
"//third_party/vulkan_validation_layers",
"//third_party/vulkan_validation_layers:vulkan_gen_json_files",
]
Expand Down
2 changes: 1 addition & 1 deletion impeller/compiler/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impeller_component("utilities") {
}

impeller_component("compiler_lib") {
include_dirs = [ "//third_party/vulkan-deps/spirv-cross/src/" ]
include_dirs = [ "//flutter/third_party/vulkan-deps/spirv-cross/src/" ]

# Current versions of libcxx have deprecated some of the UTF-16 string
# conversion APIs.
Expand Down
2 changes: 1 addition & 1 deletion impeller/renderer/backend/vulkan/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ impeller_component("vulkan") {
"../../../shader_archive",
"//flutter/flutter_vma",
"//flutter/fml",
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//third_party/vulkan_memory_allocator",
]
}
2 changes: 1 addition & 1 deletion shell/platform/embedder/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ if (enable_unittests) {

public_deps += [
"//flutter/testing:opengl",
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
]
}

Expand Down
6 changes: 3 additions & 3 deletions tools/gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,9 @@ def to_gn_args(args):
# Requires RTTI. We may want to build this in debug modes, punting on that
# for now.
gn_args['angle_enable_vulkan_validation_layers'] = False
gn_args['angle_vulkan_headers_dir'] = '//third_party/vulkan-deps/vulkan-headers/src'
gn_args['angle_vulkan_loader_dir'] = '//third_party/vulkan-deps/vulkan-loader/src'
gn_args['angle_vulkan_tools_dir'] = '//third_party/vulkan-deps/vulkan-tools/src'
gn_args['angle_vulkan_headers_dir'] = '//flutter/third_party/vulkan-deps/vulkan-headers/src'
gn_args['angle_vulkan_loader_dir'] = '//flutter/third_party/vulkan-deps/vulkan-loader/src'
gn_args['angle_vulkan_tools_dir'] = '//flutter/third_party/vulkan-deps/vulkan-tools/src'

if args.darwin_extension_safe:
gn_args['darwin_extension_safe'] = True
Expand Down
2 changes: 1 addition & 1 deletion vulkan/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ source_set("vulkan") {
public_configs = [ "//flutter:config" ]

public_deps =
[ "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
[ "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
}
2 changes: 1 addition & 1 deletion vulkan/procs/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ source_set("procs") {

public_deps = [
"//flutter/fml",
"//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
"//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
]
}

0 comments on commit d0110d9

Please sign in to comment.