aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2017-04-19 01:22:40 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-19 01:22:52 +0000
commitdf07ddd1f05bf8905b9edd41d309badc8f3a131b (patch)
treefd46d541d4ee28db8b980e97adaeea62e7dbe562 /BUILD.gn
parent7fa5c31c2c9af834bee66d5fcf476e250076c8d6 (diff)
Revert "Check-in vulkan.h into third_party and use that instead of local sdk vulkan.h"
This reverts commit edbb7d8860a63b1cacb1e89ec205c72a2de7c134. Reason for revert: breaking android Original change's description: > Check-in vulkan.h into third_party and use that instead of local sdk vulkan.h > > This change is needed since once we start getting support for varrying of extensions > and newer version support in general, we need a common vulkan header to compile off of. > Otherwise we will run into problems if clients have older headers that don't include > functions/symbols we are trying to use. > > Additionally it has the benefit of not needing to add if SK_VULKAN around code in > include which wants to use vulkan symbols. > > Bug: skia: > Change-Id: I674a253308596dc75bd23574984ae933923679f9 > Reviewed-on: https://skia-review.googlesource.com/13651 > Commit-Queue: Greg Daniel <egdaniel@google.com> > Reviewed-by: Jim Van Verth <jvanverth@google.com> > Reviewed-by: Mike Klein <mtklein@chromium.org> > TBR=mtklein@chromium.org,egdaniel@google.com,mtklein@google.com,jvanverth@google.com,bsalomon@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I179647e6ae213b1b17a9c42ced5e98c6599b96c2 Reviewed-on: https://skia-review.googlesource.com/13774 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn20
1 files changed, 17 insertions, 3 deletions
diff --git a/BUILD.gn b/BUILD.gn
index efe9583fc3..85ae068b61 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -54,6 +54,13 @@ declare_args() {
} else {
skia_use_vulkan = skia_vulkan_sdk != ""
}
+ if (is_win) {
+ skia_vulkan_headers_path = "$skia_vulkan_sdk/Include"
+ } else if (is_fuchsia) {
+ skia_vulkan_headers_path = "$fuchsia_vulkan_sdk/include"
+ } else {
+ skia_vulkan_headers_path = "$skia_vulkan_sdk/include"
+ }
}
# Our tools require static linking (they use non-exported symbols).
@@ -75,7 +82,7 @@ skia_public_includes = [
"include/svg",
"include/utils",
"include/utils/mac",
- "third_party/vulkan",
+ skia_vulkan_headers_path,
]
# Skia public API, generally provided by :skia.
@@ -743,8 +750,15 @@ if (skia_enable_tools) {
public_configs = [ ":skia.h_config" ]
skia_h = "$target_gen_dir/skia.h"
script = "gn/find_headers.py"
- args = [ rebase_path(skia_h, root_build_dir) ] +
- rebase_path(skia_public_includes)
+ if (skia_use_vulkan) {
+ use_vulkan_string = "True"
+ } else {
+ use_vulkan_string = "False"
+ }
+ args = [
+ rebase_path(skia_h, root_build_dir),
+ use_vulkan_string,
+ ] + rebase_path(skia_public_includes - [ skia_vulkan_headers_path ])
depfile = "$skia_h.deps"
outputs = [
skia_h,