Update SPIRV-Tools build

This CL updates the SPIRV-Tools DEPS entry. This requires adding a
SPIRV-Headers third_party dependency as the headers are no-longer part
of SPIRV-Tools.

The BUILD.gn file for SPIRV-Tools is added directly to the SPIRV-Tools
repo and so third_party/SPIRV-Tools/BUILD.gn can be removed. The
SPIRV-Tools build contains fuzzing targets which are enabled with this
change.

Change-Id: I9181a1b50c1f08bbe4e68dff0e00b927d297745f
Reviewed-on: https://chromium-review.googlesource.com/1142028
Commit-Queue: dsinclair <[email protected]>
Reviewed-by: Antoine Labour <[email protected]>
Reviewed-by: Jochen Eisinger <[email protected]>
Cr-Commit-Position: refs/heads/master@{#579914}
diff --git a/BUILD.gn b/BUILD.gn
index 4e777ab..77de65b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -141,6 +141,8 @@
       "//ppapi/examples/video_effects",
       "//ppapi/examples/video_encode",
       "//printing:printing_unittests",
+      "//third_party/SPIRV-Tools/src:SPIRV-Tools",
+      "//third_party/SPIRV-Tools/src/testing/fuzzers",
       "//third_party/cacheinvalidation:cacheinvalidation_unittests",
       "//third_party/pdfium/samples:pdfium_test",
       "//third_party/webrtc/rtc_tools:frame_analyzer",
diff --git a/DEPS b/DEPS
index ff5b7e8e..a8e2b0d 100644
--- a/DEPS
+++ b/DEPS
@@ -210,6 +210,14 @@
   # the commit queue can handle CLs rolling android_sdk_tools_version
   # and whatever else without interference from each other.
   'android_sdk_tools_version': 'version:26.1.1-cr9',
+  # 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': 'a97c1d911ae7b5aa40b34b21e680e7496a9e6a55',
+  # 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': 'ff684ffc6a35d2a58f0f63108877d0064ea33feb',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -345,8 +353,13 @@
       'dep_type': 'cipd',
   },
 
+  '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' + '@' + '9166854ac93ef81b026e943ccd230fed6c8b8d3c',
+    Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Tools.git@' +
+        Var('spv_tools_revision'),
 
   'src/third_party/accessibility_test_framework': {
       'packages': [
diff --git a/third_party/SPIRV-Tools/BUILD.gn b/third_party/SPIRV-Tools/BUILD.gn
deleted file mode 100644
index 807ec23..0000000
--- a/third_party/SPIRV-Tools/BUILD.gn
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//testing/test.gni")
-
-template("core_tables") {
-  assert(defined(invoker.version), "Need version in $target_name generation.")
-
-  action(target_name) {
-    script = "src/utils/generate_grammar_tables.py"
-
-    version = invoker.version
-    core_json_file = "src/source/spirv-${version}.core.grammar.json"
-    core_insts_file = "${target_gen_dir}/core.insts-${version}.inc"
-    operands_kinds_file = "${target_gen_dir}/operand.kinds-${version}.inc"
-
-    args = [
-      "--spirv-core-grammar",
-      rebase_path(core_json_file, root_build_dir),
-      "--core-insts-output",
-      rebase_path(core_insts_file, root_build_dir),
-      "--operand-kinds-output",
-      rebase_path(operands_kinds_file, root_build_dir),
-    ]
-    inputs = [
-      core_json_file,
-    ]
-    outputs = [
-      core_insts_file,
-      operands_kinds_file,
-    ]
-  }
-}
-
-template("glsl_tables") {
-  assert(defined(invoker.version), "Need version in $target_name generation.")
-
-  action(target_name) {
-    script = "src/utils/generate_grammar_tables.py"
-
-    version = invoker.version
-    core_json_file = "src/source/spirv-${version}.core.grammar.json"
-    glsl_json_file = "src/source/extinst-${version}.glsl.std.450.grammar.json"
-    glsl_insts_file = "${target_gen_dir}/glsl.std.450.insts-${version}.inc"
-
-    args = [
-      "--spirv-core-grammar",
-      rebase_path(core_json_file, root_build_dir),
-      "--extinst-glsl-grammar",
-      rebase_path(glsl_json_file, root_build_dir),
-      "--glsl-insts-output",
-      rebase_path(glsl_insts_file, root_build_dir),
-    ]
-    inputs = [
-      core_json_file,
-      glsl_json_file,
-    ]
-    outputs = [
-      glsl_insts_file,
-    ]
-  }
-}
-
-template("opencl_tables") {
-  assert(defined(invoker.version), "Need version in $target_name generation.")
-
-  action(target_name) {
-    script = "src/utils/generate_grammar_tables.py"
-
-    version = invoker.version
-    core_json_file = "src/source/spirv-${version}.core.grammar.json"
-    opengl_json_file = "src/source/extinst-${version}.opencl.std.grammar.json"
-    opencl_insts_file = "${target_gen_dir}/opencl.std.insts-${version}.inc"
-
-    args = [
-      "--spirv-core-grammar",
-      rebase_path(core_json_file, root_build_dir),
-      "--extinst-opencl-grammar",
-      rebase_path(opengl_json_file, root_build_dir),
-      "--opencl-insts-output",
-      rebase_path(opencl_insts_file, root_build_dir),
-    ]
-    inputs = [
-      core_json_file,
-      opengl_json_file,
-    ]
-    outputs = [
-      opencl_insts_file,
-    ]
-  }
-}
-
-core_tables("core_tables_1-0") {
-  version = "1-0"
-}
-core_tables("core_tables_1-1") {
-  version = "1-1"
-}
-glsl_tables("glsl_tables_1-0") {
-  version = "1-0"
-}
-opencl_tables("opencl_tables_1-0") {
-  version = "1-0"
-}
-
-action("build_version_inc") {
-  script = "src/utils/update_build_version.py"
-
-  build_version_inc = "${target_gen_dir}/build-version.inc"
-
-  args = [
-    rebase_path("src", root_build_dir),
-    rebase_path(build_version_inc, root_build_dir),
-  ]
-  inputs = [
-    "src/CHANGES",
-  ]
-  outputs = [
-    build_version_inc,
-  ]
-}
-
-config("SPIRV-Tools_config") {
-  include_dirs = [ "src/include" ]
-
-  defines = []
-  if (is_linux) {
-    defines += [ "SPIRV_LINUX" ]
-  } else if (is_win) {
-    defines += [ "SPIRV_WINDOWS" ]
-  } else if (is_mac) {
-    defines += [ "SPIRV_MAC" ]
-  } else if (is_android) {
-    defines += [ "SPIRV_ANDROID" ]
-  } else {
-    assert(false, "Unsupported platform.")
-  }
-}
-
-static_library("SPIRV-Tools") {
-  sources = [
-    "src/include/spirv-tools/libspirv.h",
-    "src/include/spirv/GLSL.std.450.h",
-    "src/include/spirv/OpenCL.std.h",
-    "src/include/spirv/spirv.h",
-    "src/source/assembly_grammar.cpp",
-    "src/source/assembly_grammar.h",
-    "src/source/binary.cpp",
-    "src/source/binary.h",
-    "src/source/diagnostic.cpp",
-    "src/source/diagnostic.h",
-    "src/source/disassemble.cpp",
-    "src/source/ext_inst.cpp",
-    "src/source/ext_inst.h",
-    "src/source/instruction.cpp",
-    "src/source/instruction.h",
-    "src/source/opcode.cpp",
-    "src/source/opcode.h",
-    "src/source/operand.cpp",
-    "src/source/operand.h",
-    "src/source/print.cpp",
-    "src/source/print.h",
-    "src/source/software_version.cpp",
-    "src/source/spirv_constant.h",
-    "src/source/spirv_definition.h",
-    "src/source/spirv_endian.cpp",
-    "src/source/spirv_endian.h",
-    "src/source/spirv_target_env.cpp",
-    "src/source/table.cpp",
-    "src/source/table.h",
-    "src/source/text.cpp",
-    "src/source/text.h",
-    "src/source/text_handler.cpp",
-    "src/source/text_handler.h",
-    "src/source/util/bitutils.h",
-    "src/source/util/hex_float.h",
-    "src/source/validate.cpp",
-    "src/source/validate.h",
-    "src/source/validate_cfg.cpp",
-    "src/source/validate_id.cpp",
-    "src/source/validate_instruction.cpp",
-    "src/source/validate_layout.cpp",
-    "src/source/validate_ssa.cpp",
-    "src/source/validate_types.cpp",
-  ]
-
-  include_dirs = [ target_gen_dir ]
-
-  all_dependent_configs = [ ":SPIRV-Tools_config" ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-
-  deps = [
-    ":build_version_inc",
-    ":core_tables_1-0",
-    ":core_tables_1-1",
-    ":glsl_tables_1-0",
-    ":opencl_tables_1-0",
-  ]
-}
-
-test("SPIRV-Tools_test") {
-  sources = [
-    "src/test/AssemblyContext.cpp",
-    "src/test/AssemblyFormat.cpp",
-    "src/test/BinaryDestroy.cpp",
-    "src/test/BinaryEndianness.cpp",
-    "src/test/BinaryHeaderGet.cpp",
-    "src/test/BinaryParse.cpp",
-    "src/test/BinaryToText.Literal.cpp",
-    "src/test/BinaryToText.cpp",
-    "src/test/Comment.cpp",
-    "src/test/DiagnosticDestroy.cpp",
-    "src/test/DiagnosticPrint.cpp",
-    "src/test/DiagnosticStream.cpp",
-    "src/test/ExtInst.OpenCL.std.cpp",
-    "src/test/ExtInstGLSLstd450.cpp",
-    "src/test/FixWord.cpp",
-    "src/test/GeneratorMagicNumber.cpp",
-    "src/test/HexFloat.cpp",
-    "src/test/ImmediateInt.cpp",
-    "src/test/LibspirvMacros.cpp",
-    "src/test/NamedId.cpp",
-    "src/test/OpcodeMake.cpp",
-    "src/test/OpcodeRequiresCapabilities.cpp",
-    "src/test/OpcodeSplit.cpp",
-    "src/test/OpcodeTableGet.cpp",
-    "src/test/Operand.cpp",
-    "src/test/OperandCapabilities.cpp",
-    "src/test/OperandPattern.cpp",
-    "src/test/SoftwareVersion.cpp",
-    "src/test/TestFixture.h",
-    "src/test/TextAdvance.cpp",
-    "src/test/TextDestroy.cpp",
-    "src/test/TextLiteral.cpp",
-    "src/test/TextStartsNewInst.cpp",
-    "src/test/TextToBinary.Annotation.cpp",
-    "src/test/TextToBinary.Barrier.cpp",
-    "src/test/TextToBinary.Constant.cpp",
-    "src/test/TextToBinary.ControlFlow.cpp",
-    "src/test/TextToBinary.Debug.cpp",
-    "src/test/TextToBinary.DeviceSideEnqueue.cpp",
-    "src/test/TextToBinary.Extension.cpp",
-    "src/test/TextToBinary.Function.cpp",
-    "src/test/TextToBinary.Group.cpp",
-    "src/test/TextToBinary.Image.cpp",
-    "src/test/TextToBinary.Literal.cpp",
-    "src/test/TextToBinary.Memory.cpp",
-    "src/test/TextToBinary.Miscellaneous.cpp",
-    "src/test/TextToBinary.ModeSetting.cpp",
-    "src/test/TextToBinary.SubgroupDispatch.cpp",
-    "src/test/TextToBinary.TypeDeclaration.cpp",
-    "src/test/TextToBinary.cpp",
-    "src/test/TextWordGet.cpp",
-    "src/test/UnitSPIRV.cpp",
-    "src/test/UnitSPIRV.h",
-    "src/test/Validate.SSA.cpp",
-
-    # TODO(dyen): Look into why these 2 files have gtest compilation errors.
-    #"src/test/Validate.Capability.cpp",
-    #"src/test/Validate.Layout.cpp",
-    "src/test/Validate.Storage.cpp",
-    "src/test/ValidateFixtures.cpp",
-    "src/test/ValidateID.cpp",
-    "src/test/ValidationState.cpp",
-    "src/test/main.cpp",
-  ]
-
-  include_dirs = [ "src" ]
-
-  deps = [
-    ":SPIRV-Tools",
-    "//base/test:test_support",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
-}
diff --git a/third_party/SPIRV-Tools/LICENSE b/third_party/SPIRV-Tools/LICENSE
index 8b2e821..d645695 100644
--- a/third_party/SPIRV-Tools/LICENSE
+++ b/third_party/SPIRV-Tools/LICENSE
@@ -1,25 +1,202 @@
-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:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-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/
+   1. Definitions.
 
-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.
+      "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
index 211e038..6639d365 100644
--- a/third_party/SPIRV-Tools/OWNERS
+++ b/third_party/SPIRV-Tools/OWNERS
@@ -1,4 +1,5 @@
 [email protected]
 [email protected]
[email protected]
 
 # COMPONENT: Internals>GPU>Internals
diff --git a/third_party/SPIRV-Tools/README.chromium b/third_party/SPIRV-Tools/README.chromium
index 5f10ef8..7225182 100644
--- a/third_party/SPIRV-Tools/README.chromium
+++ b/third_party/SPIRV-Tools/README.chromium
@@ -3,7 +3,7 @@
 URL: https://github.com/KhronosGroup/SPIRV-Tools.git
 Version: Unknown
 Security Critical: yes
-License: MIT
+License: Apache 2.0
 License File: LICENSE
 
 Description:
diff --git a/third_party/spirv-headers/LICENSE b/third_party/spirv-headers/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/third_party/spirv-headers/LICENSE
@@ -0,0 +1,202 @@
+
+                                 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
new file mode 100644
index 0000000..afa59fc
--- /dev/null
+++ b/third_party/spirv-headers/OWNERS
@@ -0,0 +1,3 @@
[email protected]
+
+# COMPONENT: Internals>GPU>Internals