Revert "Roll Vulkan repos"

DEPS

@@ -12,25 +12,25 @@ vars = {
   'deqp_revision': '66a49e0a43f7af654ee1de8a3b1bcaf6c0d14aa4',
 
   # Current revision of glslang, the Khronos SPIRV compiler.
-  'glslang_revision': 'f6e7c4d2de0d59724ea07739df70c466d169a2cd',
+  'glslang_revision': 'de3b8e3bf3893a40a1d9c3b0ed4de750e436e30f',
 
   # Current revision fo the SPIRV-Headers Vulkan support library.
-  'spirv_headers_revision': '8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23',
+  'spirv_headers_revision': '79b6681aadcb53c27d1052e5f8a0e82a981dbf2f',
 
   # Current revision of SPIRV-Tools for Vulkan.
-  'spirv_tools_revision': 'e2279da7148d19bd21c6d47ffc96ee4176f43dba',
+  'spirv_tools_revision': 'd14db341b834cfb3c574a258c331b3a6b1c2cbc5',
 
   # Current revision of Khronos Vulkan-Headers.
-  'vulkan_headers_revision': 'c200cb25db0f47364d3318d92c1d8e9dfff2fef1',
+  'vulkan_headers_revision': 'b65941cc4b2b43b74de00534d110b581c52c394b',
 
   # Current revision of Khronos Vulkan-Loader.
-  'vulkan_loader_revision': 'e1eafa18e17d00374253bcd37d015befa89fcc43',
+  'vulkan_loader_revision': '2aa6dcc10189f7700824bc5e21120beeff013c3a',
 
   # Current revision of Khronos Vulkan-Tools.
-  'vulkan_tools_revision': '91b17fd866b2e9cfb875bf516b05536d059416b1',
+  'vulkan_tools_revision': '2e8d601de618eddf2bab8597fd140b2824a060b2',
 
   # Current revision of Khronos Vulkan-ValidationLayers.
-  'vulkan_validation_revision': '4eee269ae976567ef78db9c9feaafc3364578c87',
+  'vulkan_validation_revision': '0fa2823fa693cc22afaa6e6c6d34aadb97104a2d',
 }
 
 deps = {

android/angle_apk.gni

@@ -7,9 +7,9 @@ import("//third_party/angle/gni/angle.gni")
 
 vulkan_validation_layers = [
   "VkLayer_core_validation",
-  "VkLayer_object_lifetimes",
-  "VkLayer_stateless_validation",
-  "VkLayer_thread_safety",
+  "VkLayer_object_tracker",
+  "VkLayer_parameter_validation",
+  "VkLayer_threading",
   "VkLayer_unique_objects",
 ]
 
@@ -77,10 +77,9 @@ template("angle_apk") {
         }
         if (angle_enable_vulkan_validation_layers) {
           foreach(_layer, vulkan_validation_layers) {
-            secondary_abi_shared_libraries += [
-              "${angle_root}/third_party/vulkan-validation-layers:${_layer}" +
-                  "($android_secondary_abi_toolchain)",
-            ]
+            secondary_abi_shared_libraries +=
+                [ "${angle_root}/third_party/vulkan-validation-layers:${_layer}" +
+                  "($android_secondary_abi_toolchain)" ]
           }
         }
       } else {
@@ -89,7 +88,8 @@ template("angle_apk") {
                 "root_out_dir")
         secondary_abi_loadable_modules = []
         foreach(_library, angle_libraries) {
-          secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ]
+          secondary_abi_loadable_modules +=
+            [ "${_secondary_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ]
         }
         if (angle_enable_vulkan_validation_layers) {
           foreach(_layer, vulkan_validation_layers) {
@@ -115,7 +115,9 @@ template("angle_apk") {
     } else {
       loadable_modules = []
       foreach(_library, angle_libraries) {
-        loadable_modules += [ "${root_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so" ]
+        loadable_modules += [
+          "${root_out_dir}/lib.compressed/lib${_library}${angle_libs_suffix}.so",
+        ]
       }
       if (angle_enable_vulkan_validation_layers) {
         foreach(_layer, vulkan_validation_layers) {

scripts/remove_files.py → scripts/remove_file_if_exists.py

 #!/usr/bin/python2
 #
-# Copyright 2019 The ANGLE Project Authors. All rights reserved.
+# 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_files.py:
-#   This special action is used to cleanup old files from the build directory.
-#   Otherwise ANGLE will pick up the old file(s), causing build or runtime errors.
+# 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 glob
-import os
 import sys
+import os
 
 if len(sys.argv) < 3:
-    print("Usage: " + sys.argv[0] + " <stamp_file> <remove_patterns>")
-
-stamp_file = sys.argv[1]
+    print("Usage: " + sys.argv[0] + " <remove_file> <stamp_file>")
 
-for i in range(2, len(sys.argv)):
-    remove_pattern = sys.argv[i]
-    remove_files = glob.glob(remove_pattern)
-    for f in remove_files:
-        if os.path.isfile(f):
-            os.remove(f)
+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(stamp_file, "w") as f:
+with open(sys.argv[2], "w") as f:
     f.write("blah")
     f.close()

scripts/run_code_generation_hashes.json

@@ -110,7 +110,7 @@
   "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json":
     "fa2bd54c1bb0ab2cf1d386061a4bc5c5",
   "Vulkan mandatory format support table:third_party/vulkan-headers/src/registry/vk.xml":
-    "f5c8c9b8e521644ded34d44b1016c25e",
+    "8d46c04ce50d9866c934a6c4d175ab71",
   "packed enum:src/common/gen_packed_gl_enums.py":
     "a9b1c38b4e4d8a1038e743be323f1a51",
   "packed enum:src/common/packed_egl_enums.json":

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -212,7 +212,7 @@ const char *GetVkObjectTypeName(VkObjectType type)
             return "Debug Utils Messenger";
         case VK_OBJECT_TYPE_VALIDATION_CACHE_EXT:
             return "Validation Cache";
-        case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV:
+        case VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NVX:
             return "Acceleration Structure";
         default:
             return "<Unrecognized>";