Roll (1/2) LVL version forward and disable VANGLE

Bug: angleproject:2393 Rolling Vulkan validation code forward to HEAD of master as of 3/6/18 afternoon. Disable Vulkan from the ANGLE build until ANGLE lands in Chromium. After that second part of roll will be submitted. Change-Id: I3c98b42a0b8999e8aa26f538959d888060c2026a Reviewed-on: https://chromium-review.googlesource.com/952525Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Roll (1/2) LVL version forward and disable VANGLE
37812d45 · Tobin Ehlis · Commit Bot · 24180607 · 37812d45 · 37812d45
Commit 37812d45 authored Mar 06, 2018 by Tobin Ehlis Committed by Commit Bot Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

DEPS DEPS +1 -1

DEPS.chromium DEPS.chromium +1 -1

angle.gni gni/angle.gni +5 -2

No files found.
--- a/DEPS
+++ b/DEPS
@@ -37,7 +37,7 @@ deps = {
    Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '9996173f363729b3a97309685dbd4d78547a63a7',
  'third_party/vulkan-validation-layers/src':
-    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + 'd5c8ed406ab2399a80e2847c03aa80b09b269b53',
+    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + '354ad3ba8b88136b82b712acab9b8fcb981beaff',
  'third_party/zlib':
    Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + '24ab14872e8e068ba08cc31cc3d43bcc6d5cb832',

--- a/DEPS.chromium
+++ b/DEPS.chromium
@@ -25,7 +25,7 @@ vars = {
  'spirv_tools_revision': '9996173f363729b3a97309685dbd4d78547a63a7',
  # Current revision of the Vulkan Validation Layers SDK.
-  'vulkan_revision': 'd5c8ed406ab2399a80e2847c03aa80b09b269b53',
+  'vulkan_revision': '354ad3ba8b88136b82b712acab9b8fcb981beaff',
 }
 deps = {

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