Roll vulkan-validation-layers. (1/2)

https://android.googlesource.com/platform/external/vulkan-validation-layers.git/+log/bcb80d06bbdc09..f47c534fee2f26f Disables Vulkan in ANGLE temporarily - a second CL will follow with the updated build files once ANGLE is rolled into Chrome. In particular, this roll contains a fix for a vs2017 signed/unsigned mismatch warning as error. BUG=chromium:683729 Change-Id: Ib23370d79f1359ab290f08e14a847eed75251660 Reviewed-on: https://chromium-review.googlesource.com/458531Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Roll vulkan-validation-layers. (1/2)
4063e209 · Jamie Madill · Commit Bot · 15015f7f · 4063e209 · 4063e209
Commit 4063e209 authored Mar 23, 2017 by Jamie Madill Committed by Commit Bot Mar 23, 2017
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 +2 -1

angle.gyp src/angle.gyp +2 -1

No files found.
--- a/DEPS
+++ b/DEPS
@@ -37,7 +37,7 @@ deps = {
    Var('android_git') + '/platform/external/shaderc/spirv-tools' + '@' + '68c5f0436f1d4f1f137e608780190865d0b193ca',
  'third_party/vulkan-validation-layers/src':
-    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + 'bcb80d06bbdc0910792549c7399d4ac43a94ea09',
+    Var('android_git') + '/platform/external/vulkan-validation-layers' + '@' + 'f47c534fee2f26f6b783209d56e0ade48e30eb8d',
  'third_party/zlib':
    Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + 'afd8c4593c010c045902f6c0501718f1823064a3',

--- a/DEPS.chromium
+++ b/DEPS.chromium
@@ -25,7 +25,7 @@ vars = {
  'spirv_tools_revision': '68c5f0436f1d4f1f137e608780190865d0b193ca',
  # Current revision of the Vulkan Validation Layers SDK.
-  'vulkan_revision': 'bcb80d06bbdc0910792549c7399d4ac43a94ea09',
+  'vulkan_revision': 'f47c534fee2f26f6b783209d56e0ade48e30eb8d',
 }
 deps_os = {

--- a/gni/angle.gni
+++ b/gni/angle.gni
@@ -15,7 +15,8 @@ if (is_win) {
  angle_enable_d3d9 = true
  angle_enable_d3d11 = true
  angle_enable_gl = true
-  angle_enable_vulkan = true
+  # TODO(jmadill): Re-enable Vulkan after roll.
+  angle_enable_vulkan = false
  import("//build/config/win/visual_studio_version.gni")
 } else if (is_linux && use_x11 && !is_chromeos) {

--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -30,7 +30,8 @@
                'angle_enable_d3d9%': 1,
                'angle_enable_d3d11%': 1,
                'angle_enable_hlsl%': 1,
-                'angle_enable_vulkan%': 1,
+                # TODO(jmadill): Re-enable Vulkan after roll.
+                'angle_enable_vulkan%': 0,
            }],
            ['OS=="linux" and use_x11==1 and chromeos==0',
            {