From df07ddd1f05bf8905b9edd41d309badc8f3a131b Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Wed, 19 Apr 2017 01:22:40 +0000 Subject: 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 > Reviewed-by: Jim Van Verth > Reviewed-by: Mike Klein > 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 Commit-Queue: Greg Daniel --- BUILD.gn | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'BUILD.gn') 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, -- cgit v1.2.3