From 955f8a37cc8e315cdd4776586cc50a62946c593a Mon Sep 17 00:00:00 2001
From: Corentin Wallez <cwallez@chromium.org>
Date: Thu, 16 Apr 2020 17:24:16 +0000
Subject: [PATCH] Rolling 2 dependencies

Also adds build_overrides for [vulkan_]use_x11 that are now needed for
these deps.

Roll third_party/vulkan-headers/ d287523f4..e01f13e1f (20 commits)

https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers/+log/d287523f48db..e01f13e1f777

$ git log d287523f4..e01f13e1f --date=short --no-merges --format='%ad %ae %s'
2020-04-07 oddhack Update for Vulkan-Docs 1.2.137
2020-04-06 devrel Update README.md with warning of pending header changes
2020-03-24 oddhack Update for Vulkan-Docs 1.2.136
2020-03-17 oddhack New include file with provisional extension interfaces (those interfaces not aliased by promoted-from APIs, at least).
2020-03-17 oddhack Update for Vulkan-Docs 1.2.135
2020-03-06 oddhack Update for Vulkan-Docs 1.2.134
2020-02-15 oddhack Update for Vulkan-Docs 1.2.133
2020-01-21 oddhack Update for Vulkan-Docs 1.2.132
2020-01-14 oddhack Update for Vulkan-Docs 1.2.131
2019-11-14 flibitijibibo GN: Make PLATFORM_XCB optional, based on a user-defined variable.
2019-12-09 oddhack Update for Vulkan-Docs 1.1.130
2019-11-25 oddhack Update for Vulkan-Docs 1.1.129
2019-11-21 mark build: Clarify Windows build instructions
2019-11-18 oddhack Update for Vulkan-Docs 1.1.128
2019-11-05 jmadill GN: Add support for Google Games Platform.
2019-10-25 8729214+jonahryandavis build: BUILD.gn missing defines for MacOS
2019-11-03 oddhack Update for Vulkan-Docs 1.1.127
2019-10-28 shannon vulkan: Fix typo for `operator==` in `vulkan.hpp`
2019-10-25 shannon vulkan: Update `vulkan.hpp` for VS2015 VT fix
2019-10-21 oddhack Update for Vulkan-Docs 1.1.126

Roll third_party/vulkan-validation-layers/ 237d818e8..1533266ea (553 commits)

https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers/+log/237d818e81fb..1533266eac48

$ git log 237d818e8..1533266ea --date=short --no-merges --format='%ad %ae %s'
2020-04-08 lionel.g.landwerlin Validate blending on color attachment without blending support
2020-03-03 mark scripts: Some validation-stats cleanup and update
2020-04-09 petr_kraus tests: Remove mock workarounds for vkAcquire
2020-04-09 s.fricke layers: Update AHB to Android Q and better logging
2020-04-14 mark test: Temporarily disable AHBCreateImageView test
2020-04-13 jzulauf layers: Add missing WaitSemaphores (KHR/not) entry
2020-04-13 petr_kraus layers: Add missing instance chassis locks
2020-04-06 s.fricke tests: Add support for VUID 02261 and 02262
2020-04-06 s.fricke layers: Add support for VUID 02261 and 02262
2020-04-06 s.fricke layers: Fix general external AHB tracking
2020-04-09 peter.griffin layers: Silence expected GCC warning
2020-04-09 rgarcia layers: Take separate stencil usage flags into account
2020-04-13 mark practices: Fix typo in message output
2020-04-10 mark practices: Avoid VertexInputState checks when using mesh shdrs
2020-04-10 mark tests: Revert "Remove MockICD workarounds in instanceless"
2020-04-10 charles docs: Suggest disabling validation with debug printf
2020-04-09 shannon build: Update known-good files for 1.2.137 header
2020-04-10 mark scripts: Allow clean-repo to work on empty directories
2020-04-10 mark tests: Fix rebasing error in multi-instance test
2020-04-09 mark corechecks: Stringstream can take strings natively
2020-04-09 mark layers: Removed redundant helper function
2020-04-09 mark corechecks: Normalize stringstream message output
2020-04-09 mark layers: Update FormatHandle to use stringstream
2020-04-09 mark corechecks: Fixed bad handle formats in descriptor_sets
2020-04-05 petr_kraus tests: Add multiple instance creation test
2020-04-08 petr_kraus tests: Remove MockICD workarounds in instanceless
2020-04-07 petr_kraus tests: Simplify device extension filtering
2020-04-07 petr_kraus tests: Expect VK_INCOMPLETE from pd enumeration
2020-04-04 petr_kraus tests: Remove commented code and issues
2020-03-31 petr_kraus tests: Add some instance checks
2020-04-02 petr_kraus tests: Refactor the test framework
2020-04-10 lionel.g.landwerlin Add validation for new performance query reset VUID 02863
2020-02-18 lionel.g.landwerlin Rework performance query validation
2020-02-18 lionel.g.landwerlin layers: record reset queries in state tracker
2020-04-10 lionel.g.landwerlin tests: fix incorrect/missing reset of performance queries
2020-04-09 mikes scripts: update_deps.py always pass -A on Windows
2020-04-09 mark scripts: Fix --clean-repo for read-only files
2020-04-07 mark build: Add blurb for using update_deps to change architectures
2020-04-08 s.fricke tests: Add disjoint bindImageMemory VUID
2020-04-08 s.fricke tests: Move tests to BindInvalidMemoryYcbcr
2020-04-08 s.fricke layers: Add disjoint bindImageMemory VUID
2020-04-09 s.fricke Add Documentation about writing tests
2020-04-09 mikes scripts: BP skip vkEnumerateInstanceVersion
2020-04-07 tony layers: Don't remove container contents during iteration
2020-04-07 mikes layers: Fix operator= recursion
2020-04-06 mikes layers: GCC -Wignored-qualifiers warning
2020-04-06 mikes layers: GCC -Wdeprecated-copy warning
2020-04-06 s.fricke tests: Add PhysicalDeviceFormatProperties2 for Device Profile API
2020-04-03 tony tests: Fix extraneous errors
2020-04-03 tony layers: Fix error message
(...)
2019-11-01 camden CMake: Add vklayertests_best_practices.cpp to CMake
2019-11-01 camden layers: Remove DrawCmd perf warning from Buf Val
2019-10-16 camden layers: Add DrawCmd perf warning to Best Practices
2019-11-12 mark tests: Verify reset/use of qpool in different command buffers
2019-11-13 mark corechecks: Enable querystate tracking across multiple submitInfos
2019-11-12 tony tests: Add mechanism to deal with duplicate errors
2019-11-11 mark tests: Add secondary CB VkSubmitInto validation check
2019-11-11 mark corechecks: Add secondary CB VU check
2019-11-11 mark corechecks: Fix propagation of skip in CB state validation
2019-11-12 mark build: Add VUID coverage text file to AppVeyor artifacts
2019-10-28 pdaniell tests: Add tests for VK_KHR_separate_depth_stencil_layouts
2019-10-16 PDANIELL layers: Add support for VK_KHR_separate_depth_stencil_layouts
2019-11-05 shannon build: Update known-good for 1.1.127 header
2019-11-04 jbolz layers: Update ValidateShaderStageInputOutputLimits to new spec rules
2019-11-01 mark cmake: Restore creation of standard validation json file
2019-08-21 jmacnak tests: Add RT shader group tests
2019-08-21 jmacnak layers: Add RT shader group validation
2019-10-30 mikes tests: Add macOS loader filename
2019-10-25 locke tests: Swapchain image layout
2019-10-28 locke layers: Swapchain pluarl bound_images
2019-09-27 tony gpu: Add more positive tests
2019-10-29 mark tests: Remove android limits workaround
2019-10-28 mark tests: Allow hw limits to override baked-in test GL limits
2019-10-28 bob Android: Make tests more reliable
2019-10-25 shannon build: Update known-good commits for SDK 126
2019-10-09 jeremy layers: Fix attachment unused false positive
2019-10-23 mark tests: Exclude GetomInputOutputComps limit test from Android
2019-10-23 mark tests: Fix filter key for shaderc failure messages
2019-10-16 camden layers: best_practices-Fix MemoryFree Exception
2019-10-16 camden layers: Initialize numMemObjects in BP
2019-08-16 jeremy layers: Validate specialization constants
2019-10-11 jeremy build: Update glslang
2019-10-24 mark layers: Removed obsolete layer-specific readme file
2019-10-24 mark docs: Add layer configuration doc, shared with the SDK
2019-10-23 jbolz tests: Add tests for externsync descriptorset updates
2019-10-23 jbolz layers: Relax UPDATE_AFTER_BIND externsync rules in ThreadSafety
2019-10-23 bob tests: Don't filter logcat messages
2019-10-21 shannon build: Update known-good for 1.1.126 header
2019-10-22 jbolz tests: Test CmdTraceRays with no descriptor set bound
2019-10-22 jbolz layers: Add PreCallValidateCmdTraceRaysNV
2019-10-07 locke tests: Catch the error in QueueSubmit
2019-09-30 locke layers: Check in QueueSubmit
2019-09-26 locke layers: Validate DescriptorSet Binding data
2019-10-20 jbolz tests: Add tests for ValidateEventStageMask
2019-10-20 jbolz layers: Move event/query Updates to PostCallRecordQueueSubmit
2019-09-26 jessehall layers: Check exts against required core versions
2019-09-25 jessehall layers: Add VK_KHR_spirv_1_4 validation
2019-10-17 mikes build: Add missing X11 option to GN overrides
2019-10-17 tobine build:Add VK_USE_PLATFORM_XLIB_KHR for x11
2019-10-03 emanuele.dallalonga corechecks: Fix ValidateImageBarrierAttachment resource search

Created with:
  roll-dep third_party/vulkan-headers third_party/vulkan-validation-layers

Bug: dawn:388

Change-Id: I5cefd0511af937897291644acb266f20efec66cc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/19721
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
---
 DEPS                                         |  4 ++--
 build_overrides/vulkan_headers.gni           | 17 +++++++++++++++++
 build_overrides/vulkan_validation_layers.gni |  4 ++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 build_overrides/vulkan_headers.gni

diff --git a/DEPS b/DEPS
index b9e9b378de..e033425b9a 100644
--- a/DEPS
+++ b/DEPS
@@ -103,13 +103,13 @@ deps = {
 
   # Khronos Vulkan-Headers
   'third_party/vulkan-headers': {
-    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@d287523f48dba1b669866c5d6625b29931948e39',
+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@e01f13e1f777cf592ebd1a5f4836d4cd10ed85f6',
     'condition': 'dawn_standalone',
   },
 
   # Khronos Vulkan-ValidationLayers
   'third_party/vulkan-validation-layers': {
-    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@237d818e81fbffa073d29d94f53a2cbac4f25b9f',
+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@1533266eac486fae0c34bffe4868c4bc91dbe078',
     'condition': 'dawn_standalone',
   },
 
diff --git a/build_overrides/vulkan_headers.gni b/build_overrides/vulkan_headers.gni
new file mode 100644
index 0000000000..4c0047a0d9
--- /dev/null
+++ b/build_overrides/vulkan_headers.gni
@@ -0,0 +1,17 @@
+# Copyright 2020 The Dawn Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Fake the vulkan_use_x11 when inside Dawn's repository
+import("../scripts/dawn_features.gni")
+vulkan_use_x11 = dawn_use_x11
diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
index d430597405..491afbcdfa 100644
--- a/build_overrides/vulkan_validation_layers.gni
+++ b/build_overrides/vulkan_validation_layers.gni
@@ -22,3 +22,7 @@ vvl_glslang_dir = "//third_party/glslang"
 # Subdirectories for generated files
 vulkan_data_subdir = "vulkandata"
 vulkan_gen_subdir = ""
+
+# Fake the use_x11 when inside Dawn's repository
+import("../scripts/dawn_features.gni")
+use_x11 = dawn_use_x11