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

Rolling Vulkan validation code forward to HEAD of master as of 4/16/18 morning. Disable Vulkan from the ANGLE build until ANGLE lands in Chromium. After that second part of roll will be submitted. This LVL update includes MockICD fixes to allow ANGLE perf tests to run correctly with Null Vulkan configuration. Bug: angleproject:2482 Change-Id: I61dc9ed293677a1b5839b605d7c3640dca138db3 Reviewed-on: https://chromium-review.googlesource.com/1014405Reviewed-by: Jamie Madill <jmadill@chromium.org>

Roll (1/2) LVL version forward and disable VANGLE
aa8b3982 · Tobin Ehlis · Jamie Madill · 0cb6dc4c · aa8b3982 · aa8b3982
Commit aa8b3982 authored Apr 16, 2018 by Tobin Ehlis Committed by Jamie Madill Apr 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

DEPS DEPS +1 -1

DEPS.chromium DEPS.chromium +1 -1

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

No files found.
--- a/DEPS
+++ b/DEPS
@@ -40,7 +40,7 @@ deps = {
    Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '9996173f363729b3a97309685dbd4d78547a63a7',
  '{root}/third_party/vulkan-validation-layers/src':
-    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + '354ad3ba8b88136b82b712acab9b8fcb981beaff',
+    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + '4b0d099f5388e9d5741a7013af8ab43c2827c8fb',
  '{root}/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': '354ad3ba8b88136b82b712acab9b8fcb981beaff',
+  'vulkan_revision': '4b0d099f5388e9d5741a7013af8ab43c2827c8fb',
 }
 deps = {

--- a/gni/angle.gni
+++ b/gni/angle.gni
@@ -40,8 +40,10 @@ declare_args() {
  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) ||
+  # TODO(tobine): Re-enable after roll
-                        (is_android && ndk_supports_vulkan)
+  # 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