Vulkan: Roll loader/validation layers SDK. (2/2)

gni/angle.gni

@@ -29,17 +29,13 @@ if (is_win) {
   angle_enable_d3d11 = true
   angle_enable_gl = true
   angle_enable_gl_null = true
-
-  # TODO(jmadill): Re-enable after roll.
-  # angle_enable_vulkan = true
+  angle_enable_vulkan = true
 
   import("//build/config/win/visual_studio_version.gni")
 } else if (is_linux && use_x11 && !is_chromeos) {
   angle_enable_gl = true
   angle_enable_gl_null = true
-
-  # TODO(jmadill): Re-enable after roll.
-  # angle_enable_vulkan = true
+  angle_enable_vulkan = true
 } else if (is_mac || ozone_platform_gbm) {
   angle_enable_gl = true
   angle_enable_gl_null = true

scripts/generate_vulkan_layers_json.py

@@ -29,8 +29,13 @@ for json_fname in glob.glob(os.path.join(source_dir, "*.json")):
         data = json.load(infile)
 
         # update the path
-        prev_name = os.path.basename(data['layer']['library_path'])
-        data['layer']['library_path'] = prev_name
+        if not 'layer' in data:
+            raise Exception("Could not find a layer key in " + json_fname)
+
+        # The standard validation layer has no library path.
+        if 'library_path' in data['layer']:
+            prev_name = os.path.basename(data['layer']['library_path'])
+            data['layer']['library_path'] = prev_name
 
         target_fname = os.path.join(target_dir, os.path.basename(json_fname))
         with open(target_fname, "w") as outfile:

scripts/remove_file_if_exists.py

+#!/usr/bin/python2
+#
+# Copyright 2017 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# remove_file_if_exists.py:
+#   This special action is needed to remove generated headers.
+#   Otherwise ANGLE will pick up the old file(s) and the build will fail.
+#
+
+import sys
+import os
+
+if len(sys.argv) < 3:
+    print("Usage: " + sys.argv[0] + " <remove_file> <stamp_file>")
+
+remove_file = sys.argv[1]
+if os.path.isfile(remove_file):
+    os.remove(remove_file)
+
+# touch a dummy file to keep a timestamp
+with open(sys.argv[2], "w") as f:
+    f.write("blah")
+    f.close()

src/libANGLE/renderer/vulkan/BufferVk.cpp

@@ -211,7 +211,7 @@ vk::Error BufferVk::setDataImpl(ContextVk *contextVk,
         bufferBarrier.size                = static_cast<VkDeviceSize>(size);
 
         commandBuffer->singleBufferBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
-                                           VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0, bufferBarrier);
+                                           VK_PIPELINE_STAGE_TRANSFER_BIT, 0, bufferBarrier);
 
         VkBufferCopy copyRegion = {offset, 0, size};
         commandBuffer->copyBuffer(stagingBuffer.getBuffer(), mBuffer, 1, &copyRegion);