Revert "Re-land chromium#2 "Use new vulkan-deps repo for all Vulkan d…

…ependencies."" This reverts commit fbeb26e. Reason for revert: Suspected cause of https://crbug.com/1159974 Original change's description: > Re-land chromium#2 "Use new vulkan-deps repo for all Vulkan dependencies." > > Re-land chromium#2 includes update to licenses.py and removes stale files. > > Re-land includes missing headers directory. > > This replaces several grouped dependencies with one meta-repo. > The meta-repo will allow us to group multiple inter-dependent > deps rolls into one single roll. This solves the problem of > separate rollers breaking because of the inter-dependencies. > It also allows ANGLE and Chrome to share common bits like the > README and .gitignore files. > > Bug: angleproject:5390 > Bug: 1153258 > Change-Id: Ie425e232096a25711dd90e84a6d91bf3324903ab > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595457 > Commit-Queue: Dirk Pranke <dpranke@google.com> > Reviewed-by: Dirk Pranke <dpranke@google.com> > Auto-Submit: Jamie Madill <jmadill@chromium.org> > Cr-Commit-Position: refs/heads/master@{#838196} TBR=thakis@chromium.org,dpranke@google.com,jmadill@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I60ab236419d36f55cf84c294f5a4e69f23c4c9c6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: angleproject:5390 Bug: 1153258 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595256 Reviewed-by: Sean Gilhuly <sgilhuly@chromium.org> Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org> Cr-Commit-Position: refs/heads/master@{#838227}
Denger-Network · Dec 17, 2020 · cb3f845 · cb3f845
1 parent 56ca76e
commit cb3f845
Show file tree

Hide file tree

Showing 29 changed files with 571 additions and 32 deletions.
diff --git a/.gn b/.gn
@@ -49,13 +49,6 @@ default_args = {
   # Changes some setup for the Crashpad build to set them to build against
   # Chromium's zlib, base, etc.
   crashpad_dependencies = "chromium"
-
-  # Override ANGLE's Vulkan dependencies.
-  angle_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
-  angle_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
-  angle_vulkan_tools_dir = "//third_party/vulkan-deps/vulkan-tools/src"
-  angle_vulkan_validation_layers_dir =
-      "//third_party/vulkan-deps/vulkan-validation-layers/src"
 }
 
 # These are the targets to skip header checking by default. The files in targets

diff --git a/BUILD.gn b/BUILD.gn
@@ -149,9 +149,9 @@ group("gn_all") {
       "//ppapi/examples/video_decode",
       "//ppapi/examples/video_encode",
       "//printing:printing_unittests",
+      "//third_party/SPIRV-Tools/src:SPIRV-Tools",
+      "//third_party/SPIRV-Tools/src/test/fuzzers",
       "//third_party/pdfium/samples:pdfium_test",
-      "//third_party/vulkan-deps/spirv-tools/src:SPIRV-Tools",
-      "//third_party/vulkan-deps/spirv-tools/src/test/fuzzers",
       "//tools/perf/clear_system_cache",
       "//tools/polymer:polymer_tools_python_unittests",
       "//tools/privacy_budget:privacy_budget_tools",

diff --git a/DEPS b/DEPS
@@ -310,6 +310,18 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
+  'spv_tools_revision': '671914c28e8249f0a555726a0f3f38691fe5c1df',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling feed
+  # and whatever else without interference from each other.
+  'spv_headers_revision': '05836bdba63e7debce9fa9feaed42f20cd43af9d',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling feed
+  # and whatever else without interference from each other.
+  'spirv_cross_revision': '16d9fea77c376cb5d7d6e06d33bf054fe24734a7',
+  # Three lines of non-changing comments so that
+  # the commit queue can handle CLs rolling feed
+  # and whatever else without interference from each other.
   'shaderc_revision': '4089217d30c1f035c44a08255b875b5fea4f4bc5',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
@@ -637,6 +649,22 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  # SPIRV-Cross is in third_party/spirv-cross/spirv-cross instead of
+  # third_party/spirv-cross/src  because its header files are at the root of
+  # the repository and dependencies include them like so:
+  #   #include "spirv-cross/spirv_glsl.hpp"
+  'src/third_party/spirv-cross/spirv-cross':
+    Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Cross.git@' +
+        Var('spirv_cross_revision'),
+
+  'src/third_party/spirv-headers/src':
+    Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Headers.git@' +
+        Var('spv_headers_revision'),
+
+  'src/third_party/SPIRV-Tools/src':
+    Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Tools.git@' +
+        Var('spv_tools_revision'),
+
   'src/third_party/shaderc/src':
     Var('chromium_git') + '/external/github.com/google/shaderc.git@' +
         Var('shaderc_revision'),
@@ -959,6 +987,9 @@ deps = {
   'src/third_party/libgav1/src':
     Var('chromium_git') + '/codecs/libgav1.git' + '@' + 'a9449e612bc251b4271bbe1e3a0d12e9809bf74c',
 
+  'src/third_party/glslang/src':
+    Var('chromium_git') + '/external/github.com/KhronosGroup/glslang.git' + '@' + 'd550bebee919179c9e332a0ab28a67f8fe3ca239',
+
   'src/third_party/google_toolbox_for_mac/src': {
       'url': Var('chromium_git') + '/external/github.com/google/google-toolbox-for-mac.git' + '@' + Var('google_toolbox_for_mac_revision'),
       'condition': 'checkout_ios or checkout_mac',
@@ -1481,8 +1512,6 @@ deps = {
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '995c0b84414466d77d52011e5b572cbe213b770a',
 
-  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@c0968b69b3cb78ef3b569c5a23eea47f976a8948',
-
   'src/third_party/vulkan_memory_allocator':
     Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + '6c656df63da5995a932aafd45b32af1974e497d9',
 
@@ -5014,7 +5043,6 @@ recursedeps = [
   # ANGLE manages DEPS that it also owns the build files for, such as dEQP.
   'src/third_party/angle',
   'src/third_party/openscreen/src',
-  'src/third_party/vulkan-deps',
   # src-internal has its own DEPS file to pull additional internal repos
   'src-internal',
 ]
diff --git a/build_overrides/angle.gni b/build_overrides/angle.gni
@@ -9,12 +9,12 @@ angle_root = "//third_party/angle"
 angle_has_build = true
 
 # Overrides for ANGLE's dependencies
-angle_glslang_dir = "//third_party/vulkan-deps/glslang/src"
+angle_glslang_dir = "//third_party/glslang/src"
 angle_googletest_dir = "//third_party/googletest/src"
 angle_jsoncpp_dir = "//third_party/jsoncpp"
 angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
 angle_libpng_dir = "//third_party/libpng"
-angle_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
-angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
-angle_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+angle_spirv_cross_dir = "//third_party/spirv-cross/spirv-cross"
+angle_spirv_headers_dir = "//third_party/spirv-headers/src"
+angle_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
 angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"
diff --git a/build_overrides/dawn.gni b/build_overrides/dawn.gni
@@ -8,9 +8,9 @@ dawn_googletest_dir = "//third_party/googletest/src"
 dawn_jinja2_dir = "//third_party/jinja2"
 dawn_jsoncpp_dir = "//third_party/jsoncpp"
 dawn_shaderc_dir = "//third_party/shaderc/src"
-dawn_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
-dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+dawn_spirv_cross_dir = "//third_party/spirv-cross/spirv-cross"
+dawn_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
 dawn_swiftshader_dir = "//third_party/swiftshader"
 dawn_tint_dir = "//third_party/tint/src"
 dawn_vulkan_validation_layers_dir =
-    "//third_party/vulkan-deps/vulkan-validation-layers/src"
+    "//third_party/angle/third_party/vulkan-validation-layers/src"
diff --git a/build_overrides/glslang.gni b/build_overrides/glslang.gni
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+glslang_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
 
 # Chromium uses glslang for two things:
 #

diff --git a/build_overrides/shaderc.gni b/build_overrides/shaderc.gni
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-shaderc_glslang_dir = "//third_party/vulkan-deps/glslang/src"
-shaderc_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
-shaderc_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
-shaderc_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+shaderc_glslang_dir = "//third_party/glslang/src"
+shaderc_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
+shaderc_spirv_cross_dir = "//third_party/spirv-cross/spirv-cross"
+shaderc_spirv_headers_dir = "//third_party/spirv-headers/src"
 
 shaderc_enable_spvc_parser = false
diff --git a/build_overrides/spirv_tools.gni b/build_overrides/spirv_tools.gni
@@ -7,4 +7,4 @@ spirv_tools_standalone = false
 
 # Paths to SPIRV-Tools dependencies in Chromium
 spirv_tools_googletest_dir = "//third_party/googletest/src"
-spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
+spirv_tools_spirv_headers_dir = "//third_party/spirv-headers/src"
diff --git a/build_overrides/swiftshader.gni b/build_overrides/swiftshader.gni
@@ -9,4 +9,4 @@ swiftshader_standalone = false
 swiftshader_dir = "//third_party/swiftshader"
 
 # Paths to SwiftShader dependencies
-swiftshader_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+swiftshader_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
diff --git a/build_overrides/tint.gni b/build_overrides/tint.gni
@@ -3,9 +3,9 @@
 # found in the LICENSE file.
 
 tint_root_dir = "//third_party/tint/src"
-tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+tint_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
 tint_googletest_dir = "//third_party/googletest/src"
-tint_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
+tint_spirv_headers_dir = "//third_party/spirv-headers/src"
 
 tint_build_spv_reader = true
 tint_build_spv_writer = true

diff --git a/build_overrides/vulkan_common.gni b/build_overrides/vulkan_common.gni
@@ -4,7 +4,7 @@
 
 import("//third_party/angle/gni/angle.gni")
 
-vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
+vulkan_headers_dir = "//third_party/angle/third_party/vulkan-headers/src"
 
 vulkan_data_subdir = angle_data_dir
 vulkan_gen_subdir = "angle/vulkan"
diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
@@ -4,5 +4,5 @@
 
 import("//build_overrides/vulkan_common.gni")
 
-vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
-vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"
+vvl_spirv_tools_dir = "//third_party/SPIRV-Tools/src"
+vvl_glslang_dir = "//third_party/glslang/src"
diff --git a/third_party/.gitignore b/third_party/.gitignore
@@ -89,6 +89,7 @@
 /gemmlowp/src
 /gles2_conform
 /glfw/src
+/glslang/src
 /gn/
 /gnu_binutils/
 /google_android_play_core/core-*.aar
@@ -217,6 +218,9 @@
 /snappy/src
 /soda
 /speex
+/spirv-cross/spirv-cross
+/spirv-headers/src
+/SPIRV-Tools/src
 /sqlite/src
 /sqlite4java/lib/
 /subresource-filter-ruleset/data/UnindexedRules
@@ -235,7 +239,6 @@
 /usrsctp/usrsctplib
 /v8-i18n
 /valgrind
-/vulkan-deps
 /vulkan_memory_allocator
 /wayland/src
 /wayland-protocols/src

diff --git a/third_party/SPIRV-Tools/DIR_METADATA b/third_party/SPIRV-Tools/DIR_METADATA
@@ -0,0 +1,5 @@
+monorail {
+  component: "Internals>GPU>Internals"
+}
+
+team_email: "graphics-dev@chromium.org"