Revert "Check-in vulkan.h into third_party and use that instead of local sdk vulkan.h"
This reverts commit 3a3bc42b7d5b9d996debab1d2a05d2137c875bd7.
Reason for revert: still 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.
>
> This is a reupload of CL: https://skia-review.googlesource.com/13651
>
> Bug: skia:
> Change-Id: I091f526b8c4a61774c34834cd7bfb7e2c822ff5c
> Reviewed-on: https://skia-review.googlesource.com/13804
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
>
TBR=djsollen@google.com,egdaniel@google.com,mtklein@google.com,jvanverth@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ic595e32005761170156499cfb6efc1acfce96001
Reviewed-on: https://skia-review.googlesource.com/13806
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/BUILD.gn b/BUILD.gn
index efe9583..85ae068 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -54,6 +54,13 @@
} 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 @@
"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 @@
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,