AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove superfluous skia_vulkan_sdk

Browse Source 
We don't actually need the SDK to build anymore.

If you previously set skia_vulkan_sdk or relied on VULKAN_SDK
in the environment, now set skia_use_vulkan = true instead.

We still need the linux_vulkan_sdk asset for Test/Perf bots.

Change-Id: I70ad9c5181ae61725b9dc25cc887dd0640beeed6
Reviewed-on: https://skia-review.googlesource.com/c/184065
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-01-15 11:26:43 -05:00 committed by Skia Commit-Bot
parent 553610d792
commit 98dea7b11c
7 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BUILD.gn
View File

@ -79,11 +79,8 @@ declare_args() {
skia_use_vulkan = defined(ndk_api) && ndk_api >= 24
} else if (is_fuchsia) {
skia_use_vulkan = fuchsia_use_vulkan
} else if (is_win && target_cpu == "arm64") {
skia_use_vulkan = false
} else {
skia_use_vulkan = (defined(skia_vulkan_sdk) && skia_vulkan_sdk != "") ||
(defined(skia_moltenvk_path) && skia_moltenvk_path != "")
skia_use_vulkan = defined(skia_moltenvk_path) && skia_moltenvk_path != ""
}
if (is_ios) {

1
gn/BUILDCONFIG.gn
View File

@ -33,7 +33,6 @@ declare_args() {
clang_win = ""
skia_vulkan_sdk = getenv("VULKAN_SDK")
skia_moltenvk_path = ""
}
declare_args() {

3
infra/bots/gen_tasks.go
View File

@ -856,9 +856,6 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
if strings.Contains(name, "Clang") {
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("clang_linux"))
}
if strings.Contains(name, "Vulkan") {
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("linux_vulkan_sdk"))
}
if parts["target_arch"] == "mips64el" || parts["target_arch"] == "loongson3a" {
if parts["compiler"] != "GCC" {
glog.Fatalf("mips64el toolchain is GCC, but compiler is %q in %q", parts["compiler"], name)

3
infra/bots/recipe_modules/build/default.py
View File

@ -57,7 +57,6 @@ def compile_fn(api, checkout_root, out_dir):
target_arch = api.vars.builder_cfg.get('target_arch', '')
clang_linux = str(api.vars.slave_dir.join('clang_linux'))
linux_vulkan_sdk = str(api.vars.slave_dir.join('linux_vulkan_sdk'))
win_toolchain = str(api.vars.slave_dir.join('win_toolchain'))
moltenvk = str(api.vars.slave_dir.join('moltenvk'))
@ -211,8 +210,6 @@ def compile_fn(api, checkout_root, out_dir):
if 'Vulkan' in extra_tokens and not 'Android' in extra_tokens:
args['skia_use_vulkan'] = 'true'
args['skia_enable_vulkan_debug_layers'] = 'false'
if api.vars.is_linux:
args['skia_vulkan_sdk'] = '"%s"' % linux_vulkan_sdk
if 'MoltenVK' in extra_tokens:
args['skia_moltenvk_path'] = '"%s"' % moltenvk
if 'Metal' in extra_tokens:

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json
View File

@ -32,7 +32,7 @@
"[START_DIR]/cache/work/skia/bin/gn",
"gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Vulkan/Release",
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_use_vulkan=true skia_vulkan_sdk=\"[START_DIR]/linux_vulkan_sdk\" target_cpu=\"x86_64\""
"--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false skia_enable_vulkan_debug_layers=false skia_use_vulkan=true target_cpu=\"x86_64\""
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {

25
infra/bots/tasks.json
View File

@ -7015,11 +7015,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:13"
},
{
"name": "skia/bots/linux_vulkan_sdk",
"path": "linux_vulkan_sdk",
"version": "version:1"
}
],
"command": [
@ -8201,11 +8196,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:13"
},
{
"name": "skia/bots/linux_vulkan_sdk",
"path": "linux_vulkan_sdk",
"version": "version:1"
}
],
"command": [
@ -8722,11 +8712,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:13"
},
{
"name": "skia/bots/linux_vulkan_sdk",
"path": "linux_vulkan_sdk",
"version": "version:1"
}
],
"command": [
@ -10281,11 +10266,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:13"
},
{
"name": "skia/bots/linux_vulkan_sdk",
"path": "linux_vulkan_sdk",
"version": "version:1"
}
],
"command": [
@ -10415,11 +10395,6 @@
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:13"
},
{
"name": "skia/bots/linux_vulkan_sdk",
"path": "linux_vulkan_sdk",
"version": "version:1"
}
],
"command": [

3
site/user/special/vulkan.md
View File

@ -10,8 +10,7 @@ bugs to vendors as we find them.
Windows and Linux
-----------------
To build the Vulkan backend, set `skia_vulkan_sdk` to the path to your Vulkan SDK in `args.gn`.
This defaults to the environment variable `VULKAN_SDK`.
To build the Vulkan backend, set `skia_use_vulkan=true` in `args.gn`.
Android
-------