Flatten vulkan-deps.
Sub-repos will be now checked out in third_party directly,
instead of under third_party/vulkan-deps.
Bug: chromium:341002187
Change-Id: I66e9731a478f7416d2e27879b616576209a631f7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/189420
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
diff --git a/.gitignore b/.gitignore
index 4310f96..8c3d854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
/third_party/dxc
/third_party/dxheaders
/third_party/glfw
+/third_party/glslang/src/
/third_party/google_benchmark/src
/third_party/googletest
/third_party/gpuweb
@@ -40,11 +41,20 @@
/third_party/partition_alloc
/third_party/protobuf
/third_party/rust-toolchain
+/third_party/spirv-cross/src/
+/third_party/spirv-headers/src/
+/third_party/spirv-tools/src/
/third_party/swiftshader
/third_party/vulkan-deps
+/third_party/vulkan-headers/src/
+/third_party/vulkan-loader/src/
+/third_party/vulkan-tools/src/
+/third_party/vulkan-utility-libraries/src/
+/third_party/vulkan-validation-layers/src/
/third_party/vulkan_memory_allocator
/third_party/webgpu-cts
/third_party/zlib
+/tools/bin
/tools/clang
/tools/cmake*
/tools/golang
diff --git a/.gitmodules b/.gitmodules
index e666fb9..74dd01f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,6 +77,42 @@
path = third_party/vulkan-deps
url = https://chromium.googlesource.com/vulkan-deps
gclient-condition = dawn_standalone
+[submodule "third_party/glslang/src"]
+ path = third_party/glslang/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang
+ gclient-condition = dawn_standalone
+[submodule "third_party/spirv-cross/src"]
+ path = third_party/spirv-cross/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross
+ gclient-condition = dawn_standalone
+[submodule "third_party/spirv-headers/src"]
+ path = third_party/spirv-headers/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers
+ gclient-condition = dawn_standalone
+[submodule "third_party/spirv-tools/src"]
+ path = third_party/spirv-tools/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools
+ gclient-condition = dawn_standalone
+[submodule "third_party/vulkan-headers/src"]
+ path = third_party/vulkan-headers/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers
+ gclient-condition = dawn_standalone
+[submodule "third_party/vulkan-loader/src"]
+ path = third_party/vulkan-loader/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader
+ gclient-condition = dawn_standalone
+[submodule "third_party/vulkan-tools/src"]
+ path = third_party/vulkan-tools/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools
+ gclient-condition = dawn_standalone
+[submodule "third_party/vulkan-utility-libraries/src"]
+ path = third_party/vulkan-utility-libraries/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries
+ gclient-condition = dawn_standalone
+[submodule "third_party/vulkan-validation-layers/src"]
+ path = third_party/vulkan-validation-layers/src
+ url = https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers
+ gclient-condition = dawn_standalone
[submodule "third_party/zlib"]
path = third_party/zlib
url = https://chromium.googlesource.com/chromium/src/third_party/zlib
diff --git a/.gn b/.gn
index 44779cd..9696d53 100644
--- a/.gn
+++ b/.gn
@@ -39,12 +39,12 @@
angle_build_tests = false
angle_has_rapidjson = false
angle_use_wayland = false
- 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_headers_dir = "//third_party/vulkan-headers/src"
+ angle_vulkan_loader_dir = "//third_party/vulkan-loader/src"
+ angle_vulkan_tools_dir = "//third_party/vulkan-tools/src"
angle_vulkan_validation_layers_dir =
- "//third_party/vulkan-deps/vulkan-validation-layers/src"
+ "//third_party/vulkan-validation-layers/src"
- vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
+ vma_vulkan_headers_dir = "//third_party/vulkan-headers/src"
use_sysroot = true
}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dc8b01..8675f42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,7 +256,6 @@
set(ABSL_PROPAGATE_CXX_STD ON)
set_if_not_defined(DAWN_THIRD_PARTY_DIR "${Dawn_SOURCE_DIR}/third_party" "Directory in which to find third-party dependencies.")
-set_if_not_defined(DAWN_VULKAN_DEPS_DIR "${DAWN_THIRD_PARTY_DIR}/vulkan-deps" "Directory in which to find vulkan-deps")
set_if_not_defined(DAWN_ABSEIL_DIR "${DAWN_THIRD_PARTY_DIR}/abseil-cpp" "Directory in which to find Abseil")
set_if_not_defined(DAWN_GLFW_DIR "${DAWN_THIRD_PARTY_DIR}/glfw" "Directory in which to find GLFW")
@@ -266,10 +265,10 @@
set_if_not_defined(DAWN_SWIFTSHADER_DIR "${DAWN_THIRD_PARTY_DIR}/swiftshader" "Directory in which to find swiftshader")
set_if_not_defined(DAWN_PROTOBUF_DIR "${DAWN_THIRD_PARTY_DIR}/protobuf" "Directory in which to find protobuf")
-set_if_not_defined(DAWN_SPIRV_TOOLS_DIR "${DAWN_VULKAN_DEPS_DIR}/spirv-tools/src" "Directory in which to find SPIRV-Tools")
-set_if_not_defined(DAWN_SPIRV_HEADERS_DIR "${DAWN_VULKAN_DEPS_DIR}/spirv-headers/src" "Directory in which to find SPIRV-Headers")
-set_if_not_defined(DAWN_VULKAN_HEADERS_DIR "${DAWN_VULKAN_DEPS_DIR}/vulkan-headers/src" "Directory in which to find Vulkan-Headers")
-set_if_not_defined(DAWN_VULKAN_UTILITY_LIBRARIES_DIR "${DAWN_VULKAN_DEPS_DIR}/vulkan-utility-libraries/src" "Directory in which to find Vulkan-Utility-Libraries")
+set_if_not_defined(DAWN_SPIRV_TOOLS_DIR "${DAWN_THIRD_PARTY_DIR}/spirv-tools/src" "Directory in which to find SPIRV-Tools")
+set_if_not_defined(DAWN_SPIRV_HEADERS_DIR "${DAWN_THIRD_PARTY_DIR}/spirv-headers/src" "Directory in which to find SPIRV-Headers")
+set_if_not_defined(DAWN_VULKAN_HEADERS_DIR "${DAWN_THIRD_PARTY_DIR}/vulkan-headers/src" "Directory in which to find Vulkan-Headers")
+set_if_not_defined(DAWN_VULKAN_UTILITY_LIBRARIES_DIR "${DAWN_THIRD_PARTY_DIR}/vulkan-utility-libraries/src" "Directory in which to find Vulkan-Utility-Libraries")
# Dependencies for DAWN_BUILD_NODE_BINDINGS
set_if_not_defined(NODE_ADDON_API_DIR "${DAWN_THIRD_PARTY_DIR}/node-addon-api" "Directory in which to find node-addon-api")
diff --git a/DEPS b/DEPS
index 4a044ef..087b77b 100644
--- a/DEPS
+++ b/DEPS
@@ -276,6 +276,51 @@
'condition': 'dawn_standalone',
},
+ 'third_party/glslang/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@541733a66b1cf4465559c78a8bd857606ac76123',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/spirv-cross/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@b8fcf307f1f347089e3c46eb4451d27f32ebc8d3',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/spirv-headers/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@49a1fceb9b1d087f3c25ad5ec077bb0e46231297',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/spirv-tools/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@199038f10cbe56bf7cbfeb5472eb0a25af2f09f5',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/vulkan-headers/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@5677bafb820e476441e9e1f745371b72133407d3',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/vulkan-loader/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@a1a73779649c0bfdaba6b856f7c9c96be6fc75cb',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/vulkan-tools/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@137b3612d62f1c92da16537e5497a60fcf13b6dc',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/vulkan-utility-libraries/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@777358fdad21132866be4a835327fbc28eabc1a4',
+ 'condition': 'dawn_standalone',
+ },
+
+ 'third_party/vulkan-validation-layers/src': {
+ 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@7a2c19e8681065645030b34dfe99835473f9303c',
+ 'condition': 'dawn_standalone',
+ },
+
'third_party/zlib': {
'url': '{chromium_git}/chromium/src/third_party/zlib@526382e41c9c5275dc329db4328b54e4f344a204',
'condition': 'dawn_standalone',
@@ -671,7 +716,3 @@
],
},
]
-
-recursedeps = [
- 'third_party/vulkan-deps',
-]
diff --git a/OWNERS b/OWNERS
index 2909d4d..bf4af02 100644
--- a/OWNERS
+++ b/OWNERS
@@ -23,6 +23,7 @@
per-file third_party/dxc=*
per-file third_party/dxheaders=*
per-file third_party/glfw=*
+per-file third_party/glslang/src=*
per-file third_party/google_benchmark/src=*
per-file third_party/googletest=*
per-file third_party/gpuweb=*
@@ -33,9 +34,17 @@
per-file third_party/node-addon-api=*
per-file third_party/node-api-headers=*
per-file third_party/protobuf=*
+per-file third_party/spirv-cross/src=*
+per-file third_party/spirv-headers/src=*
+per-file third_party/spirv-tools/src=*
per-file third_party/swiftshader=*
per-file third_party/vulkan_memory_allocator=*
per-file third_party/vulkan-deps=*
+per-file third_party/vulkan-headers/src=*
+per-file third_party/vulkan-loader/src=*
+per-file third_party/vulkan-tools/src=*
+per-file third_party/vulkan-utility-libraries/src=*
+per-file third_party/vulkan-validation-layers/src=*
per-file third_party/webgpu-cts=*
per-file third_party/zlib=*
per-file tools/clang=*
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index c69afe1..ec3257b 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -52,12 +52,12 @@
local_repository(
name = "spirv_headers",
- path = "third_party/vulkan-deps/spirv-headers/src",
+ path = "third_party/spirv-headers/src",
)
local_repository(
name = "spirv_tools",
- path = "third_party/vulkan-deps/spirv-tools/src",
+ path = "third_party/spirv-tools/src",
)
http_archive(
diff --git a/build_overrides/angle.gni b/build_overrides/angle.gni
index 95e90c8..8a31237 100644
--- a/build_overrides/angle.gni
+++ b/build_overrides/angle.gni
@@ -32,7 +32,7 @@
angle_has_build = true
# Paths to ANGLE dependencies in Dawn
-angle_glslang_dir = "//third_party/vulkan-deps/glslang/src"
-angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
-angle_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+angle_glslang_dir = "//third_party/glslang/src"
+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
index 4c5bff0..74109ad 100644
--- a/build_overrides/dawn.gni
+++ b/build_overrides/dawn.gni
@@ -48,11 +48,10 @@
dawn_jinja2_dir = "//third_party/jinja2"
dawn_glfw_dir = "//third_party/glfw"
dawn_googletest_dir = "//third_party/googletest"
-dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+dawn_spirv_tools_dir = "//third_party/spirv-tools/src"
dawn_swiftshader_dir = "//third_party/swiftshader"
-dawn_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
-dawn_vulkan_validation_layers_dir =
- "//third_party/vulkan-deps/vulkan-validation-layers/src"
+dawn_vulkan_loader_dir = "//third_party/vulkan-loader/src"
+dawn_vulkan_validation_layers_dir = "//third_party/vulkan-validation-layers/src"
dawn_dxc_dir = "//third_party/dxc"
dawn_dxheaders_dir = "//third_party/dxheaders"
diff --git a/build_overrides/glslang.gni b/build_overrides/glslang.gni
index 651e936..42b5b95 100644
--- a/build_overrides/glslang.gni
+++ b/build_overrides/glslang.gni
@@ -25,4 +25,4 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+glslang_spirv_tools_dir = "//third_party/spirv-tools/src"
diff --git a/build_overrides/spirv_tools.gni b/build_overrides/spirv_tools.gni
index 2123e65..ca5ba4a 100644
--- a/build_overrides/spirv_tools.gni
+++ b/build_overrides/spirv_tools.gni
@@ -30,4 +30,4 @@
# Paths to SPIRV-Tools dependencies in Dawn
spirv_tools_googletest_dir = "//third_party/googletest"
-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/tint.gni b/build_overrides/tint.gni
index 7e14e84..4ebab93 100644
--- a/build_overrides/tint.gni
+++ b/build_overrides/tint.gni
@@ -29,6 +29,6 @@
tint_standalone = true
tint_has_build = true
-tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
-tint_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
-tint_glslang_dir = "//third_party/vulkan-deps/glslang/src"
+tint_spirv_tools_dir = "//third_party/spirv-tools/src"
+tint_spirv_headers_dir = "//third_party/spirv-headers/src"
+tint_glslang_dir = "//third_party/glslang/src"
diff --git a/build_overrides/vulkan_common.gni b/build_overrides/vulkan_common.gni
index 8b1c370..fc5b147 100644
--- a/build_overrides/vulkan_common.gni
+++ b/build_overrides/vulkan_common.gni
@@ -25,7 +25,7 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
+vulkan_headers_dir = "//third_party/vulkan-headers/src"
# Subdirectories for generated files
vulkan_data_subdir = "vulkandata"
diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
index ad9d752..5aa3be3 100644
--- a/build_overrides/vulkan_validation_layers.gni
+++ b/build_overrides/vulkan_validation_layers.gni
@@ -30,11 +30,10 @@
# These are variables that are overridable by projects that include Dawn.
# The values in this file are the defaults for when we are building from
# Dawn's repository.
-vvl_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
-vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
-vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"
-vulkan_utility_libraries_dir =
- "//third_party/vulkan-deps/vulkan-utility-libraries/src"
+vvl_spirv_headers_dir = "//third_party/spirv-headers/src"
+vvl_spirv_tools_dir = "//third_party/spirv-tools/src"
+vvl_glslang_dir = "//third_party/glslang/src"
+vulkan_utility_libraries_dir = "//third_party/vulkan-utility-libraries/src"
# Forward to ozone_platform_x11 when inside Dawn's repository
import("../scripts/dawn_features.gni")
diff --git a/scripts/dawn_overrides_with_defaults.gni b/scripts/dawn_overrides_with_defaults.gni
index 69addb4..e6b9837 100644
--- a/scripts/dawn_overrides_with_defaults.gni
+++ b/scripts/dawn_overrides_with_defaults.gni
@@ -61,7 +61,7 @@
}
if (!defined(dawn_spirv_tools_dir)) {
- dawn_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+ dawn_spirv_tools_dir = "//third_party/spirv-tools/src"
}
if (!defined(dawn_swiftshader_dir)) {
@@ -69,28 +69,21 @@
dawn_swiftshader_dir = ""
}
-if (!defined(dawn_vulkan_deps_dir)) {
- dawn_vulkan_deps_dir = "//third_party/vulkan-deps"
- if (dawn_standalone) {
- dawn_vulkan_deps_dir = "${dawn_root}/third_party/vulkan-deps"
- }
-}
-
if (!defined(dawn_vulkan_headers_dir)) {
- dawn_vulkan_headers_dir = "${dawn_vulkan_deps_dir}/vulkan-headers/src"
+ dawn_vulkan_headers_dir = "//third_party/vulkan-headers/src"
}
if (!defined(dawn_vulkan_loader_dir)) {
# Default to the Vulkan loader not being available except in standalone.
dawn_vulkan_loader_dir = ""
if (dawn_standalone) {
- dawn_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
+ dawn_vulkan_loader_dir = "//third_party/vulkan-loader/src"
}
}
if (!defined(dawn_vulkan_utility_libraries_dir)) {
dawn_vulkan_utility_libraries_dir =
- "${dawn_vulkan_deps_dir}/vulkan-utility-libraries/src"
+ "//third_party/vulkan-utility-libraries/src"
}
if (!defined(dawn_vulkan_validation_layers_dir)) {
diff --git a/scripts/tint_overrides_with_defaults.gni b/scripts/tint_overrides_with_defaults.gni
index ec98511..8cfa9ae 100644
--- a/scripts/tint_overrides_with_defaults.gni
+++ b/scripts/tint_overrides_with_defaults.gni
@@ -52,12 +52,12 @@
# Path to spirv-tools checkout
if (!defined(tint_spirv_tools_dir)) {
- tint_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
+ tint_spirv_tools_dir = "//third_party/spirv-tools/src"
}
# Path to glslang checkout
if (!defined(tint_glslang_dir)) {
- tint_glslang_dir = "//third_party/vulkan-deps/glslang/src"
+ tint_glslang_dir = "//third_party/glslang/src"
}
# Path to googletest checkout
@@ -67,7 +67,7 @@
# Path to spirv-headers checkout
if (!defined(tint_spirv_headers_dir)) {
- tint_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
+ tint_spirv_headers_dir = "//third_party/spirv-headers/src"
}
if (!defined(tint_build_cmds)) {
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index ee9c860..5ceeb73 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -75,7 +75,7 @@
if(NOT TARGET glslang AND (${TINT_BUILD_GLSL_WRITER} OR ${TINT_BUILD_GLSL_VALIDATOR}) AND ${TINT_BUILD_CMD_TOOLS})
set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "" FORCE)
set(ENABLE_OPT OFF CACHE BOOL "" FORCE)
- add_subdirectory("${DAWN_THIRD_PARTY_DIR}/vulkan-deps/glslang/src" "${CMAKE_CURRENT_BINARY_DIR}/glslang" EXCLUDE_FROM_ALL)
+ add_subdirectory("${DAWN_THIRD_PARTY_DIR}/glslang/src" "${CMAKE_CURRENT_BINARY_DIR}/glslang" EXCLUDE_FROM_ALL)
endif()
if (NOT TARGET glfw AND DAWN_USE_GLFW)
diff --git a/third_party/glslang/DIR_METADATA b/third_party/glslang/DIR_METADATA
new file mode 100644
index 0000000..348e542
--- /dev/null
+++ b/third_party/glslang/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail {
+ component: "Internals>GPU>Internals"
+}
+team_email: "graphics-dev@chromium.org"
diff --git a/third_party/glslang/LICENSE b/third_party/glslang/LICENSE
new file mode 100644
index 0000000..8b2e821
--- /dev/null
+++ b/third_party/glslang/LICENSE
@@ -0,0 +1,25 @@
+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/README.chromium b/third_party/glslang/README.chromium
new file mode 100644
index 0000000..7c3e05a
--- /dev/null
+++ b/third_party/glslang/README.chromium
@@ -0,0 +1,16 @@
+Name: Khronos reference front-end for GLSL and ESSL
+Short Name: glslang
+URL: https://github.com/KhronosGroup/glslang
+Version: Unknown
+Security Critical: yes
+Shipped: no
+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/glslang/src b/third_party/glslang/src
new file mode 160000
index 0000000..541733a
--- /dev/null
+++ b/third_party/glslang/src
@@ -0,0 +1 @@
+Subproject commit 541733a66b1cf4465559c78a8bd857606ac76123
diff --git a/third_party/spirv-cross/DIR_METADATA b/third_party/spirv-cross/DIR_METADATA
new file mode 100644
index 0000000..e353adf
--- /dev/null
+++ b/third_party/spirv-cross/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail: {
+ component: "Internals>GPU>Internals"
+}
+team_email: "graphics-dev@chromium.org"
diff --git a/third_party/spirv-cross/README.chromium b/third_party/spirv-cross/README.chromium
new file mode 100644
index 0000000..42c1f15
--- /dev/null
+++ b/third_party/spirv-cross/README.chromium
@@ -0,0 +1,13 @@
+Name: SPIRV-Cross
+Short Name: SPIRV-Cross
+URL: https://github.com/KhronosGroup/SPIRV-Cross
+Version: Unknown
+Security Critical: yes
+Shipped: no
+License: Apache 2.0
+License File: src/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-cross/src b/third_party/spirv-cross/src
new file mode 160000
index 0000000..b8fcf30
--- /dev/null
+++ b/third_party/spirv-cross/src
@@ -0,0 +1 @@
+Subproject commit b8fcf307f1f347089e3c46eb4451d27f32ebc8d3
diff --git a/third_party/spirv-headers/DIR_METADATA b/third_party/spirv-headers/DIR_METADATA
new file mode 100644
index 0000000..e353adf
--- /dev/null
+++ b/third_party/spirv-headers/DIR_METADATA
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..d64569567
--- /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/README.chromium b/third_party/spirv-headers/README.chromium
new file mode 100644
index 0000000..758a714
--- /dev/null
+++ b/third_party/spirv-headers/README.chromium
@@ -0,0 +1,15 @@
+Name: SPIR-V Headers
+Short Name: spirv-headers
+URL: https://github.com/KhronosGroup/SPIRV-Headers.git
+Version: unknown
+Security Critical: yes
+Shipped: 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/third_party/spirv-headers/src b/third_party/spirv-headers/src
new file mode 160000
index 0000000..49a1fce
--- /dev/null
+++ b/third_party/spirv-headers/src
@@ -0,0 +1 @@
+Subproject commit 49a1fceb9b1d087f3c25ad5ec077bb0e46231297
diff --git a/third_party/spirv-tools/DIR_METADATA b/third_party/spirv-tools/DIR_METADATA
new file mode 100644
index 0000000..376e229
--- /dev/null
+++ b/third_party/spirv-tools/DIR_METADATA
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..d64569567
--- /dev/null
+++ b/third_party/spirv-tools/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-tools/README.chromium b/third_party/spirv-tools/README.chromium
new file mode 100644
index 0000000..a2d18d7
--- /dev/null
+++ b/third_party/spirv-tools/README.chromium
@@ -0,0 +1,16 @@
+Name: SPIR-V Tools
+Short Name: SPIRV-Tools
+URL: https://github.com/KhronosGroup/SPIRV-Tools.git
+Version: Unknown
+Security Critical: yes
+Shipped: 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/spirv-tools/src b/third_party/spirv-tools/src
new file mode 160000
index 0000000..199038f
--- /dev/null
+++ b/third_party/spirv-tools/src
@@ -0,0 +1 @@
+Subproject commit 199038f10cbe56bf7cbfeb5472eb0a25af2f09f5
diff --git a/third_party/vulkan-headers/DIR_METADATA b/third_party/vulkan-headers/DIR_METADATA
new file mode 100644
index 0000000..e353adf
--- /dev/null
+++ b/third_party/vulkan-headers/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail: {
+ component: "Internals>GPU>Internals"
+}
+team_email: "graphics-dev@chromium.org"
diff --git a/third_party/vulkan-headers/LICENSE.txt b/third_party/vulkan-headers/LICENSE.txt
new file mode 100644
index 0000000..d64569567
--- /dev/null
+++ b/third_party/vulkan-headers/LICENSE.txt
@@ -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/vulkan-headers/README.chromium b/third_party/vulkan-headers/README.chromium
new file mode 100644
index 0000000..947684c
--- /dev/null
+++ b/third_party/vulkan-headers/README.chromium
@@ -0,0 +1,12 @@
+Name: Vulkan API headers
+Short Name: Vulkan
+URL: https://github.com/KhronosGroup/Vulkan-Headers
+Version: 1.2.140
+Revision: 9250d5ae8f50202005233dc0512a1d460c8b4833
+Security Critical: yes
+Shipped: yes
+License: Apache 2.0
+License File: LICENSE.txt
+
+Description:
+Vulkan Header files and API registry
diff --git a/third_party/vulkan-headers/src b/third_party/vulkan-headers/src
new file mode 160000
index 0000000..5677baf
--- /dev/null
+++ b/third_party/vulkan-headers/src
@@ -0,0 +1 @@
+Subproject commit 5677bafb820e476441e9e1f745371b72133407d3
diff --git a/third_party/vulkan-loader/README.chromium b/third_party/vulkan-loader/README.chromium
new file mode 100644
index 0000000..654ff3b
--- /dev/null
+++ b/third_party/vulkan-loader/README.chromium
@@ -0,0 +1,16 @@
+Name: Vulkan Loader Components
+Short Name: Vulkan Loader
+Version: N/A
+URL: https://github.com/KhronosGroup/Vulkan-Loader
+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Loader.git
+Revision: HEAD
+Security Critical: no
+Shipped: yes
+License: Apache 2.0
+License File: src/LICENSE.txt
+
+Description:
+The Vulkan Loader Components are used to build the open-source desktop Vulkan loader. The loader
+is a library that loads the Vulkan entry points and hooks them into the correct layers and the
+client driver (ICD). This is required for using Vulkan layers and applications.
+
diff --git a/third_party/vulkan-loader/src b/third_party/vulkan-loader/src
new file mode 160000
index 0000000..a1a7377
--- /dev/null
+++ b/third_party/vulkan-loader/src
@@ -0,0 +1 @@
+Subproject commit a1a73779649c0bfdaba6b856f7c9c96be6fc75cb
diff --git a/third_party/vulkan-tools/README.chromium b/third_party/vulkan-tools/README.chromium
new file mode 100644
index 0000000..ccf51ff
--- /dev/null
+++ b/third_party/vulkan-tools/README.chromium
@@ -0,0 +1,15 @@
+Name: Khronos Vulkan Tools Components
+Short Name: Vulkan Tools
+Version: N/A
+URL: https://github.com/KhronosGroup/Vulkan-Tools
+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Tools.git
+Revision: HEAD
+Security Critical: no
+Shipped: no
+License: Apache 2.0
+License File: src/LICENSE.txt
+
+Description:
+The Khronos Vulkan Tools Components contain the Vulkan Mock Installable
+Client Driver (ICD) as well as the vulkaninfo utility.
+
diff --git a/third_party/vulkan-tools/src b/third_party/vulkan-tools/src
new file mode 160000
index 0000000..137b361
--- /dev/null
+++ b/third_party/vulkan-tools/src
@@ -0,0 +1 @@
+Subproject commit 137b3612d62f1c92da16537e5497a60fcf13b6dc
diff --git a/third_party/vulkan-utility-libraries/README.chromium b/third_party/vulkan-utility-libraries/README.chromium
new file mode 100644
index 0000000..64528cb
--- /dev/null
+++ b/third_party/vulkan-utility-libraries/README.chromium
@@ -0,0 +1,15 @@
+Name: Khronos Vulkan Utility Libraries
+Short Name: Vulkan Utility Libraries
+Version: N/A
+URL: https://github.com/KhronosGroup/Vulkan-Utility-Libraries
+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
+Revision: HEAD
+Security Critical: no
+Shipped: no
+License: Apache 2.0
+License File: src/LICENSE.md
+
+Description:
+
+The Khronos Vulkan Utility Libraries contains the layer settings library and
+miscellaneous utility headers for Vulkan developers.
diff --git a/third_party/vulkan-utility-libraries/src b/third_party/vulkan-utility-libraries/src
new file mode 160000
index 0000000..777358f
--- /dev/null
+++ b/third_party/vulkan-utility-libraries/src
@@ -0,0 +1 @@
+Subproject commit 777358fdad21132866be4a835327fbc28eabc1a4
diff --git a/third_party/vulkan-validation-layers/README.chromium b/third_party/vulkan-validation-layers/README.chromium
new file mode 100644
index 0000000..1c5714b
--- /dev/null
+++ b/third_party/vulkan-validation-layers/README.chromium
@@ -0,0 +1,18 @@
+Name: Khronos Vulkan Validation Layers Components
+Short Name: Vulkan Validation Layers
+Version: N/A
+URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
+SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
+Revision: HEAD
+Security Critical: no
+Shipped: no
+License: Apache 2.0
+License File: src/LICENSE.txt
+
+Description:
+The Khronos Vulkan Validation Layers Components consist of the Vulkan
+Validation Layers. The layers help validate Vulkan programs at runtime
+for development. When enabled the Vulkan loader will hook the layers
+into the Vulkan APIs so that they evaluate Vulkan API calls and flag
+the incorrect use of the API with callbacks. The layers are essential
+for developing Vulkan applications.
diff --git a/third_party/vulkan-validation-layers/src b/third_party/vulkan-validation-layers/src
new file mode 160000
index 0000000..7a2c19e
--- /dev/null
+++ b/third_party/vulkan-validation-layers/src
@@ -0,0 +1 @@
+Subproject commit 7a2c19e8681065645030b34dfe99835473f9303c
diff --git a/tools/fetch_dawn_dependencies.py b/tools/fetch_dawn_dependencies.py
index 1190414..4c80f9c 100644
--- a/tools/fetch_dawn_dependencies.py
+++ b/tools/fetch_dawn_dependencies.py
@@ -102,13 +102,12 @@
'third_party/khronos/EGL-Registry',
'third_party/khronos/OpenGL-Registry',
'third_party/markupsafe',
- 'third_party/vulkan-deps',
- 'third_party/vulkan-deps/glslang/src',
- 'third_party/vulkan-deps/spirv-headers/src',
- 'third_party/vulkan-deps/spirv-tools/src',
- 'third_party/vulkan-deps/vulkan-headers/src',
- 'third_party/vulkan-deps/vulkan-loader/src',
- 'third_party/vulkan-deps/vulkan-utility-libraries/src',
+ 'third_party/glslang/src',
+ 'third_party/spirv-headers/src',
+ 'third_party/spirv-tools/src',
+ 'third_party/vulkan-headers/src',
+ 'third_party/vulkan-loader/src',
+ 'third_party/vulkan-utility-libraries/src',
]
if args.use_test_deps:
