From 57d6662b796f0768d7a017f6b7f43784dc41c7c6 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@google.com>
Date: Tue, 17 Sep 2019 10:52:41 -0400
Subject: [PATCH 1/3] Roll Vulkan headers and loader to v1.1.114

---
 DEPS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPS b/DEPS
index 7520caa93..a12f77d9a 100644
--- a/DEPS
+++ b/DEPS
@@ -19,8 +19,8 @@ vars = {
   'spirv_headers_revision': '38cafab379e5d16137cb97a485b9385191039b92',
   'spirv_tools_revision': 'c0e9807094ef6e345ef0a4d5f17af81af063cd27',
   'swiftshader_revision': 'ef44b4402722658648ec9d10a76bd990776be1c0',
-  'vulkan_headers_revision': '8e2c4cd554b644592a6d904f2c8000ebbd4aa77f',
-  'vulkan_loader_revision': '15fa85d92454f7823febeb68b56038d427e2a7a4',
+  'vulkan_headers_revision': 'e3f96a9ccab9397481eb81c4d9bce4ea7590dc33',
+  'vulkan_loader_revision': '1bb7f68564fe565de2927071c79008bd6ede5af5',
 }
 
 deps = {

From 6f219279020d93560e01aa6cb1195041dea2bd65 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@google.com>
Date: Tue, 17 Sep 2019 11:21:28 -0400
Subject: [PATCH 2/3] cmake stuff

---
 kokoro/scripts/macos/build.sh    | 2 ++
 kokoro/scripts/windows/build.bat | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kokoro/scripts/macos/build.sh b/kokoro/scripts/macos/build.sh
index acbb76b77..6c6fb63ba 100644
--- a/kokoro/scripts/macos/build.sh
+++ b/kokoro/scripts/macos/build.sh
@@ -26,6 +26,8 @@ unzip -q ninja-mac.zip
 chmod +x ninja
 export PATH="$PWD:$PATH"
 
+echo $(date): $(cmake --version)
+
 cd $SRC
 ./tools/git-sync-deps
 
diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat
index 3f245f2cd..e59e8dfd4 100644
--- a/kokoro/scripts/windows/build.bat
+++ b/kokoro/scripts/windows/build.bat
@@ -18,7 +18,11 @@ set BUILD_ROOT=%cd%
 set SRC=%cd%\github\amber
 set BUILD_TYPE=%1
 
-set PATH=C:\python36;%PATH%
+choco install cmake --pre --yes --no-progress
+choco upgrade cmake --pre --yes --no-progress
+
+:: Force usage of python 3.6 and add cmake to the path.
+set PATH=C:\python36;"C:\Program Files\CMake\bin";%PATH%
 
 cd %SRC%
 python tools\git-sync-deps
@@ -29,6 +33,8 @@ python tools\git-sync-deps
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
 echo "Using VS 2017..."
 
+cmake --version
+
 cd %SRC%
 mkdir build
 cd build

From bca8fa5a33ff2d44a615242bd0f3fb7ca72bb894 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@google.com>
Date: Tue, 17 Sep 2019 13:53:40 -0400
Subject: [PATCH 3/3] More vulkan dirs

---
 src/vulkan/find_vulkan.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vulkan/find_vulkan.cmake b/src/vulkan/find_vulkan.cmake
index 7097ecf0b..69d5fc943 100644
--- a/src/vulkan/find_vulkan.cmake
+++ b/src/vulkan/find_vulkan.cmake
@@ -25,9 +25,13 @@ if (NOT ${Vulkan_FOUND})
     set(VulkanHeaders_INCLUDE_DIR
       ${PROJECT_SOURCE_DIR}/third_party/vulkan-headers/include
       CACHE PATH "vk headers dir" FORCE)
+    set(VulkanHeaders_INCLUDE_DIRS ${VulkanHeaders_INCLUDE_DIR}
+      CACHE PATH "vk headers dir" FORCE)
     set(VulkanRegistry_DIR
       ${PROJECT_SOURCE_DIR}/third_party/vulkan-headers/registry
       CACHE PATH "vk_registry_dir" FORCE)
+    set(VulkanRegistry_DIRS ${VulkanRegistry_DIR}
+      CACHE PATH "vk_registry_dir" FORCE)
     include_directories(BEFORE "${VulkanHeaders_INCLUDE_DIR}")
     set(VULKAN_LIB vulkan)
     message(STATUS "Amber: using local vulkan")