From fbeb26e5d6050bc1548766cdf354c1eadb75d0e4 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Thu, 17 Dec 2020 20:12:09 +0000 Subject: [PATCH] Re-land #2 "Use new vulkan-deps repo for all Vulkan dependencies." Re-land #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 Reviewed-by: Dirk Pranke Auto-Submit: Jamie Madill Cr-Commit-Position: refs/heads/master@{#838196} --- .gn | 7 + BUILD.gn | 4 +- DEPS | 34 +--- build_overrides/angle.gni | 8 +- build_overrides/dawn.gni | 6 +- build_overrides/glslang.gni | 2 +- build_overrides/shaderc.gni | 8 +- build_overrides/spirv_tools.gni | 2 +- build_overrides/swiftshader.gni | 2 +- build_overrides/tint.gni | 4 +- build_overrides/vulkan_common.gni | 2 +- build_overrides/vulkan_validation_layers.gni | 4 +- third_party/.gitignore | 5 +- third_party/SPIRV-Tools/DIR_METADATA | 5 - third_party/SPIRV-Tools/LICENSE | 202 ------------------- third_party/SPIRV-Tools/OWNERS | 2 - third_party/SPIRV-Tools/README.chromium | 15 -- third_party/glslang/DIR_METADATA | 4 - third_party/glslang/LICENSE | 25 --- third_party/glslang/OWNERS | 2 - third_party/glslang/README.chromium | 15 -- third_party/spirv-cross/DIR_METADATA | 4 - third_party/spirv-cross/OWNERS | 2 - third_party/spirv-cross/README.chromium | 12 -- third_party/spirv-headers/DIR_METADATA | 4 - third_party/spirv-headers/LICENSE | 202 ------------------- third_party/spirv-headers/OWNERS | 1 - third_party/spirv-headers/README.chromium | 14 -- tools/licenses.py | 6 - 29 files changed, 32 insertions(+), 571 deletions(-) delete mode 100644 third_party/SPIRV-Tools/DIR_METADATA delete mode 100644 third_party/SPIRV-Tools/LICENSE delete mode 100644 third_party/SPIRV-Tools/OWNERS delete mode 100644 third_party/SPIRV-Tools/README.chromium delete mode 100644 third_party/glslang/DIR_METADATA delete mode 100644 third_party/glslang/LICENSE delete mode 100644 third_party/glslang/OWNERS delete mode 100644 third_party/glslang/README.chromium delete mode 100644 third_party/spirv-cross/DIR_METADATA delete mode 100644 third_party/spirv-cross/OWNERS delete mode 100644 third_party/spirv-cross/README.chromium delete mode 100644 third_party/spirv-headers/DIR_METADATA delete mode 100644 third_party/spirv-headers/LICENSE delete mode 100644 third_party/spirv-headers/OWNERS delete mode 100644 third_party/spirv-headers/README.chromium diff --git a/.gn b/.gn index d8529c7e4f71d5..2836133e782e04 100644 --- a/.gn +++ b/.gn @@ -49,6 +49,13 @@ 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 index f7a8c62f9b35a9..89fff8cc30ad9a 100644 --- 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 index 29786e294bdf99..0a76bc37987b51 100644 --- a/DEPS +++ b/DEPS @@ -310,18 +310,6 @@ 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 @@ -649,22 +637,6 @@ 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'), @@ -987,9 +959,6 @@ 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', @@ -1512,6 +1481,8 @@ 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', @@ -5043,6 +5014,7 @@ 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 index 8af05e4f89827c..2879e293c0cd1c 100644 --- 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/glslang/src" +angle_glslang_dir = "//third_party/vulkan-deps/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/spirv-cross/spirv-cross" -angle_spirv_headers_dir = "//third_party/spirv-headers/src" -angle_spirv_tools_dir = "//third_party/SPIRV-Tools/src" +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_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator" diff --git a/build_overrides/dawn.gni b/build_overrides/dawn.gni index 84bcfbd77330bb..f8848c4a6b4974 100644 --- 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/spirv-cross/spirv-cross" -dawn_spirv_tools_dir = "//third_party/SPIRV-Tools/src" +dawn_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src" +dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src" dawn_swiftshader_dir = "//third_party/swiftshader" dawn_tint_dir = "//third_party/tint/src" dawn_vulkan_validation_layers_dir = - "//third_party/angle/third_party/vulkan-validation-layers/src" + "//third_party/vulkan-deps/vulkan-validation-layers/src" diff --git a/build_overrides/glslang.gni b/build_overrides/glslang.gni index d9f9d64d9131c1..9090ce612ea795 100644 --- 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/SPIRV-Tools/src" +glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src" # Chromium uses glslang for two things: # diff --git a/build_overrides/shaderc.gni b/build_overrides/shaderc.gni index a8267948fd5102..3de56ecf807141 100644 --- 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/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_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_enable_spvc_parser = false diff --git a/build_overrides/spirv_tools.gni b/build_overrides/spirv_tools.gni index cc7e7d147c3eb7..a25b1ea02edee3 100644 --- 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/spirv-headers/src" +spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src" diff --git a/build_overrides/swiftshader.gni b/build_overrides/swiftshader.gni index 338b8f2cf8d270..2864da9ad2c3d9 100644 --- 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/SPIRV-Tools/src" +swiftshader_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src" diff --git a/build_overrides/tint.gni b/build_overrides/tint.gni index 95bb287e95fe77..8cd0d6fc346704 100644 --- 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/SPIRV-Tools/src" +tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src" tint_googletest_dir = "//third_party/googletest/src" -tint_spirv_headers_dir = "//third_party/spirv-headers/src" +tint_spirv_headers_dir = "//third_party/vulkan-deps/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 index ad1fb8e38c08f8..7aafea83cdb93a 100644 --- 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/angle/third_party/vulkan-headers/src" +vulkan_headers_dir = "//third_party/vulkan-deps/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 index b893ce134f416f..5d1a0f6f0991da 100644 --- 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/SPIRV-Tools/src" -vvl_glslang_dir = "//third_party/glslang/src" +vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src" +vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src" diff --git a/third_party/.gitignore b/third_party/.gitignore index e789259c4d5569..dd70593fd706c7 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -89,7 +89,6 @@ /gemmlowp/src /gles2_conform /glfw/src -/glslang/src /gn/ /gnu_binutils/ /google_android_play_core/core-*.aar @@ -218,9 +217,6 @@ /snappy/src /soda /speex -/spirv-cross/spirv-cross -/spirv-headers/src -/SPIRV-Tools/src /sqlite/src /sqlite4java/lib/ /subresource-filter-ruleset/data/UnindexedRules @@ -239,6 +235,7 @@ /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 deleted file mode 100644 index 376e2293f35c7a..00000000000000 --- a/third_party/SPIRV-Tools/DIR_METADATA +++ /dev/null @@ -1,5 +0,0 @@ -monorail { - component: "Internals>GPU>Internals" -} - -team_email: "graphics-dev@chromium.org" diff --git a/third_party/SPIRV-Tools/LICENSE b/third_party/SPIRV-Tools/LICENSE deleted file mode 100644 index d645695673349e..00000000000000 --- a/third_party/SPIRV-Tools/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/third_party/SPIRV-Tools/OWNERS b/third_party/SPIRV-Tools/OWNERS deleted file mode 100644 index caff5903358768..00000000000000 --- a/third_party/SPIRV-Tools/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -vmiura@chromium.org -dsinclair@chromium.org diff --git a/third_party/SPIRV-Tools/README.chromium b/third_party/SPIRV-Tools/README.chromium deleted file mode 100644 index 7225182fda6195..00000000000000 --- a/third_party/SPIRV-Tools/README.chromium +++ /dev/null @@ -1,15 +0,0 @@ -Name: SPIR-V Tools -Short Name: SPIRV-Tools -URL: https://github.com/KhronosGroup/SPIRV-Tools.git -Version: Unknown -Security Critical: yes -License: Apache 2.0 -License File: LICENSE - -Description: -The SPIR-V Tools project provides an API and commands for processing -SPIR-V modules. - -Local Modifications: -Added OWNERS, README.chromium. -Ported build rules from CMake to GN. diff --git a/third_party/glslang/DIR_METADATA b/third_party/glslang/DIR_METADATA deleted file mode 100644 index 348e5424b52a1d..00000000000000 --- a/third_party/glslang/DIR_METADATA +++ /dev/null @@ -1,4 +0,0 @@ -monorail { - component: "Internals>GPU>Internals" -} -team_email: "graphics-dev@chromium.org" diff --git a/third_party/glslang/LICENSE b/third_party/glslang/LICENSE deleted file mode 100644 index 8b2e82136ba8c3..00000000000000 --- a/third_party/glslang/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2015-2016 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS -KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS -SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT - https://www.khronos.org/registry/ - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/third_party/glslang/OWNERS b/third_party/glslang/OWNERS deleted file mode 100644 index ed07d05f577263..00000000000000 --- a/third_party/glslang/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -dsinclair@chromium.org -vmiura@chromium.org diff --git a/third_party/glslang/README.chromium b/third_party/glslang/README.chromium deleted file mode 100644 index f22f536268afac..00000000000000 --- a/third_party/glslang/README.chromium +++ /dev/null @@ -1,15 +0,0 @@ -Name: Khronos reference front-end for GLSL and ESSL -Short Name: glslang -URL: https://github.com/KhronosGroup/glslang -Version: Unknown -Security Critical: yes -License: MIT -License File: LICENSE - -Description: -An OpenGL and OpenGL ES shader front end and validator. - -Local Modifications: -Added OWNERS, README.chromium. -Ported build rules from CMake to GN. -5/13/2016 - Updated GN build rules to include new files added in repository. diff --git a/third_party/spirv-cross/DIR_METADATA b/third_party/spirv-cross/DIR_METADATA deleted file mode 100644 index e353adfc5e67ef..00000000000000 --- a/third_party/spirv-cross/DIR_METADATA +++ /dev/null @@ -1,4 +0,0 @@ -monorail: { - component: "Internals>GPU>Internals" -} -team_email: "graphics-dev@chromium.org" diff --git a/third_party/spirv-cross/OWNERS b/third_party/spirv-cross/OWNERS deleted file mode 100644 index b375c584fa2c18..00000000000000 --- a/third_party/spirv-cross/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -cwallez@chromium.org -dsinclair@chromium.org diff --git a/third_party/spirv-cross/README.chromium b/third_party/spirv-cross/README.chromium deleted file mode 100644 index 4b96bf38f0aeb3..00000000000000 --- a/third_party/spirv-cross/README.chromium +++ /dev/null @@ -1,12 +0,0 @@ -Name: SPIRV-Cross -Short Name: SPIRV-Cross -URL: https://github.com/KhronosGroup/SPIRV-Cross -Version: Unknown -Security Critical: yes -License: Apache 2.0 -License File: spirv-cross/LICENSE - -Description: -A translator from SPIR-V bytecode to other shading languages like GLSL, HLSL -and MSL. This project is not secure (yet!) and should only be used for -prototyping, and not shipped to users. diff --git a/third_party/spirv-headers/DIR_METADATA b/third_party/spirv-headers/DIR_METADATA deleted file mode 100644 index e353adfc5e67ef..00000000000000 --- a/third_party/spirv-headers/DIR_METADATA +++ /dev/null @@ -1,4 +0,0 @@ -monorail: { - component: "Internals>GPU>Internals" -} -team_email: "graphics-dev@chromium.org" diff --git a/third_party/spirv-headers/LICENSE b/third_party/spirv-headers/LICENSE deleted file mode 100644 index d645695673349e..00000000000000 --- a/third_party/spirv-headers/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/third_party/spirv-headers/OWNERS b/third_party/spirv-headers/OWNERS deleted file mode 100644 index d417f075be464c..00000000000000 --- a/third_party/spirv-headers/OWNERS +++ /dev/null @@ -1 +0,0 @@ -dsinclair@chromium.org diff --git a/third_party/spirv-headers/README.chromium b/third_party/spirv-headers/README.chromium deleted file mode 100644 index f7df74e7f8e215..00000000000000 --- a/third_party/spirv-headers/README.chromium +++ /dev/null @@ -1,14 +0,0 @@ -Name: SPIR-V Headers -Short Name: spirv-headers -URL: https://github.com/KhronosGroup/SPIRV-Headers.git -Version: unknown -Security Critical: yes -License: MIT -License File: LICENSE - -Description: -This repository contains machine-readable files from the SPIR-V Registry. This includes: - -* Header files for various languages. -* JSON files describing the grammar for the SPIR-V core instruction set, and for the GLSL.std.450 extended instruction set. -* The XML registry file. diff --git a/tools/licenses.py b/tools/licenses.py index ef74fc668056fd..c548ac8f2b2d78 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -163,12 +163,6 @@ "URL": "http://code.google.com/p/angleproject/", "License": "BSD", }, - os.path.join('third_party', 'angle', 'third_party', 'vulkan-headers'): { - "Name": "Vulkan-Headers", - "URL": "https://github.com/KhronosGroup/Vulkan-Headers", - "License": "Apache 2.0", - "License File": "src/LICENSE.txt", - }, os.path.join('third_party', 'cros_system_api'): { "Name": "Chromium OS system API", "URL": "http://www.chromium.org/chromium-os",