Roll (2/2) to latest LVL as of 3/6/18

Bug: angleproject:2393 Moving to HEAD of LVL master on afternoon of 3/6/18. Made some updates to BUILD.gn to add args to spirv tools external_revision_generator.py script. Re-enable ANGLE Vulkan build. Change-Id: I1705d7a2acae578bab9bbd8bb93176107e0e21dc Reviewed-on: https://chromium-review.googlesource.com/952547Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Roll (2/2) to latest LVL as of 3/6/18
da6dd738 · Tobin Ehlis · Commit Bot · 40dba690 · da6dd738 · da6dd738
Commit da6dd738 authored Mar 06, 2018 by Tobin Ehlis Committed by Commit Bot Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

angle.gni gni/angle.gni +2 -4

BUILD.gn third_party/vulkan-validation-layers/BUILD.gn +3 -0

No files found.
--- a/gni/angle.gni
+++ b/gni/angle.gni
@@ -38,10 +38,8 @@ declare_args() {
  angle_enable_d3d11 = is_win
  angle_enable_gl = ozone_platform_gbm || !is_linux || (use_x11 && !is_chromeos)
-  # TODO(tobine): Re-enable after roll
+  angle_enable_vulkan = is_win || (is_linux && use_x11 && !is_chromeos) ||
-  #  angle_enable_vulkan = is_win || (is_linux && use_x11 && !is_chromeos) ||
+                        (is_android && ndk_supports_vulkan)
-  #                        (is_android && ndk_supports_vulkan)
-  angle_enable_vulkan = false
  angle_enable_null = true
  angle_enable_essl = true
  angle_enable_glsl = true

--- a/third_party/vulkan-validation-layers/BUILD.gn
+++ b/third_party/vulkan-validation-layers/BUILD.gn
@@ -178,8 +178,11 @@ if (spirv_use_commit_id) {
      "$vulkan_gen_dir/spirv_tools_commit_id.h",
    ]
    args = [
+      "--git_dir",
      "$raw_spirv_tools_dir",
+      "-s",
      "SPIRV_TOOLS_COMMIT_ID",
+      "-o",
      "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
    ]
  }