Skip to content

A
angle
Commit 653f6196 by Jamie Madill Committed by Commit Bot
Options

Import Vulkan DEPS from the new vulkan-deps repo.

This will allow the entire set of Vulkan DEPS to be rolled as one. Bug: angleproject:5390 Change-Id: I10ca4f966f986baf3aab7250935802a3ed1065f1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2587671 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 0bb22ef2
Showing with 25 additions and 195 deletions
.gitignore
......@@ -37,7 +37,6 @@
/third_party/fuchsia-sdk
/third_party/gles1_conform
/third_party/glmark2/src
/third_party/glslang/src
/third_party/googletest
/third_party/jsoncpp
/third_party/libjpeg_turbo
......@@ -49,15 +48,9 @@
/third_party/qemu-linux-x64
/third_party/qemu-mac-x64
/third_party/rapidjson/src
/third_party/spirv-cross/src
/third_party/spirv-headers/src
/third_party/spirv-tools/src
/third_party/SwiftShader
/third_party/VK-GL-CTS/src
/third_party/vulkan-headers/src
/third_party/vulkan-loader/src
/third_party/vulkan-tools/src
/third_party/vulkan-validation-layers/src
/third_party/vulkan-deps
/third_party/vulkan_memory_allocator
/third_party/zlib
/tools/clang
......
DEPS
......@@ -28,9 +28,6 @@ vars = {
# Current revision of VK-GL-CTS (a.k.a dEQP).
'vk_gl_cts_revision': '54509765b18dae2b4836073f538b3a32667b97b6',
# Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': '6d5916d4a91eb9c3b3be377382e2c1c12443fa11',
# Current revision of googletest.
# Note: this dep cannot be auto-rolled b/c of nesting.
'googletest_revision': '4fe018038f87675c083d0cfb6a6b57c274fb1753',
......@@ -65,27 +62,6 @@ vars = {
# Note: this dep cannot be auto-rolled b/c of nesting.
'patched_yasm_revision': '720b70524a4424b15fc57e82263568c8ba0496ad',
# Current revision of spirv-cross, the Khronos SPIRV cross compiler.
'spirv_cross_revision': 'be527632a6c80291ab012a79758e0e41224ad5e2',
# Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': '05836bdba63e7debce9fa9feaed42f20cd43af9d',
# Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': '671914c28e8249f0a555726a0f3f38691fe5c1df',
# Current revision of Khronos Vulkan-Headers.
'vulkan_headers_revision': '30e70cbd9850560cb55bffadb8017e90c04c42f5',
# Current revision of Khronos Vulkan-Loader.
'vulkan_loader_revision': '02a49daeeeceb077e5ab8c80e87c22dcbb4a102b',
# Current revision of Khronos Vulkan-Tools.
'vulkan_tools_revision': '0e8c2a5ca5f302f0137550bca1d8557cbaf87ad7',
# Current revision of Khronos Vulkan-ValidationLayers.
'vulkan_validation_revision': 'ce0450b9e8e54f0b8c6fff185166e1e42e0cf7c2',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
......@@ -158,11 +134,6 @@ deps = {
'url': '{chromium_git}/external/github.com/glmark2/glmark2@9e01aef1a786b28aca73135a5b00f85c357e8f5e',
},
'third_party/glslang/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@{glslang_revision}',
'condition': 'not build_with_chromium',
},
'third_party/googletest': {
'url': '{chromium_git}/chromium/src/third_party/googletest@{chromium_googletest_revision}',
'condition': 'not build_with_chromium',
......@@ -225,21 +196,6 @@ deps = {
'url': '{chromium_git}/external/github.com/Tencent/rapidjson@7484e06c589873e1ed80382d262087e4fa80fb63',
},
'third_party/spirv-cross/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@{spirv_cross_revision}',
'condition': 'not build_with_chromium',
},
'third_party/spirv-headers/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@{spirv_headers_revision}',
'condition': 'not build_with_chromium',
},
'third_party/spirv-tools/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@{spirv_tools_revision}',
'condition': 'not build_with_chromium',
},
'third_party/SwiftShader': {
'url': '{swiftshader_git}/SwiftShader@1cc5b3357d2ff3c81ef7ec0b07a6660796bde5cd',
'condition': 'not build_with_chromium',
......@@ -249,12 +205,9 @@ deps = {
'url': '{chromium_git}/external/github.com/KhronosGroup/VK-GL-CTS@{vk_gl_cts_revision}',
},
'third_party/vulkan-headers/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@{vulkan_headers_revision}',
},
'third_party/vulkan-loader/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@{vulkan_loader_revision}',
'third_party/vulkan-deps': {
'url': '{chromium_git}/vulkan-deps@b08eace32e9cb8dd7dce9866f051558ac57acb15',
'condition': 'not build_with_chromium',
},
'third_party/vulkan_memory_allocator': {
......@@ -262,14 +215,6 @@ deps = {
'condition': 'not build_with_chromium',
},
'third_party/vulkan-tools/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@{vulkan_tools_revision}',
},
'third_party/vulkan-validation-layers/src': {
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@{vulkan_validation_revision}',
},
'third_party/zlib': {
'url': '{chromium_git}/chromium/src/third_party/zlib@2c183c9f93a328bfb3121284da13cf89a0f7e64a',
'condition': 'not build_with_chromium',
......@@ -544,4 +489,5 @@ recursedeps = [
'buildtools',
'third_party/googletest',
'third_party/jsoncpp',
'third_party/vulkan-deps',
]
build_overrides/angle.gni
......@@ -10,12 +10,12 @@ angle_has_build = true
# Overrides for ANGLE's dependencies
angle_abseil_cpp_dir = "//third_party/abseil-cpp"
angle_glslang_dir = "//third_party/glslang/src"
angle_glslang_dir = "//third_party/vulkan-deps/glslang/src"
angle_googletest_dir = "//third_party/googletest/src"
angle_jsoncpp_dir = "//third_party/jsoncpp"
angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
angle_libpng_dir = "//third_party/libpng"
angle_spirv_cross_dir = "//third_party/spirv-cross/src"
angle_spirv_headers_dir = "//third_party/spirv-headers/src"
angle_spirv_tools_dir = "//third_party/spirv-tools/src"
angle_spirv_cross_dir = "//third_party/vulkan-deps/spirv-cross/src"
angle_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
angle_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
angle_vulkan_memory_allocator_dir = "//third_party/vulkan_memory_allocator"
build_overrides/glslang.gni
......@@ -3,7 +3,7 @@
# found in the LICENSE file.
# Paths to glslang dependencies in ANGLE
glslang_spirv_tools_dir = "//third_party/spirv-tools/src"
glslang_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
# Reduce glslang's features to what the Vulkan backend of ANGLE uses. This both speeds up glslang's
# initialization and reduces binary footprint.
......
build_overrides/spirv_tools.gni
......@@ -7,4 +7,4 @@ spirv_tools_standalone = false
# Paths to SPIRV-Tools dependencies in ANGLE
spirv_tools_googletest_dir = "//third_party/googletest/src"
spirv_tools_spirv_headers_dir = "//third_party/spirv-headers/src"
spirv_tools_spirv_headers_dir = "//third_party/vulkan-deps/spirv-headers/src"
build_overrides/swiftshader.gni
......@@ -9,4 +9,4 @@ swiftshader_standalone = false
swiftshader_dir = "//third_party/SwiftShader"
# Paths to SwiftShader dependencies
swiftshader_spirv_tools_dir = "//third_party/spirv-tools/src"
swiftshader_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
build_overrides/vulkan_validation_layers.gni
......@@ -5,8 +5,8 @@
import("//gni/angle.gni")
vulkan_headers_dir = angle_vulkan_headers_dir
vvl_spirv_tools_dir = "//third_party/spirv-tools/src"
vvl_glslang_dir = "//third_party/glslang/src"
vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"
vulkan_data_subdir = angle_data_dir
vulkan_gen_subdir = "angle/vulkan"
gni/angle.gni
......@@ -152,11 +152,14 @@ declare_args() {
!(target_environment == "catalyst" &&
(target_cpu == "x86" || target_cpu == "x64"))
angle_vulkan_headers_dir = "$angle_root/third_party/vulkan-headers/src"
angle_vulkan_loader_dir = "$angle_root/third_party/vulkan-loader/src"
angle_vulkan_tools_dir = "$angle_root/third_party/vulkan-tools/src"
angle_vulkan_headers_dir =
"$angle_root/third_party/vulkan-deps/vulkan-headers/src"
angle_vulkan_loader_dir =
"$angle_root/third_party/vulkan-deps/vulkan-loader/src"
angle_vulkan_tools_dir =
"$angle_root/third_party/vulkan-deps/vulkan-tools/src"
angle_vulkan_validation_layers_dir =
"$angle_root/third_party/vulkan-validation-layers/src"
"$angle_root/third_party/vulkan-deps/vulkan-validation-layers/src"
}
declare_args() {
......
scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
......@@ -2,11 +2,11 @@
"src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py":
"dab4614bbee0c3fbc5b3ccaaa11ba9d3",
"81b0f05df8707c886bb80fe0214acb6e",
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json":
"fa2bd54c1bb0ab2cf1d386061a4bc5c5",
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
"8bfd8a3857c2b9062d7ada46c7d27bcf",
"third_party/vulkan-headers/src/registry/vk.xml":
"third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml":
"a3961cf58e819e8ef966bf4f1c356e33"
}
\ No newline at end of file
src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py
......@@ -89,7 +89,7 @@ def main():
input_file_name = 'vk_mandatory_format_support_data.json'
out_file_name = 'vk_mandatory_format_support_table_autogen.cpp'
vk_xml_file = '../../../../third_party/vulkan-headers/src/registry/vk.xml'
vk_xml_file = '../../../../third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml'
# auto_script parameters.
if len(sys.argv) > 1:
......
third_party/glslang/README.angle deleted 100644 → 0
Name: Khronos reference front-end for GLSL and ESSL
Short Name: glslang
URL: https://github.com/google/glslang
Version: N/A
Security Critical: yes
License: MIT
License File: LICENSE
Description:
An OpenGL and OpenGL ES shader front end and validator.
third_party/spirv-cross/README.angle deleted 100644 → 0
Name: Khronos SPIRV-Cross
Short Name: spirv-cross
URL: https://github.com/KhronosGroup/SPIRV-Cross
Version: N/A
Security Critical: yes
License: Apache 2.0
License File: LICENSE
Description:
A tool designed for parsing and converting SPIR-V to other shader languages.
\ No newline at end of file
third_party/spirv-headers/README.angle deleted 100644 → 0
Name: SPIR-V Headers
Short Name: spirv-headers
URL: https://github.com/KhronosGroup/SPIRV-Headers.git
Version: Unknown
Security Critical: yes
License: MIT
License File: LICENSE
Description:
This repository contains machine-readable files from the SPIR-V Registry. This includes:
* Header files for various languages.
* JSON files describing the grammar for the SPIR-V core instruction set, and for the GLSL.std.450 extended instruction set.
* The XML registry file.
third_party/spirv-tools/README.angle deleted 100644 → 0
Name: SPIR-V Tools
Short Name: SPIRV-Tools
URL: https://github.com/KhronosGroup/SPIRV-Tools.git
Version: Unknown
Security Critical: yes
License: MIT
License File: LICENSE
Description:
The SPIR-V Tools project provides an API and commands for processing
SPIR-V modules.
third_party/vulkan-headers/README.angle deleted 100644 → 0
Name: Vulkan Header Components
Short Name: Vulkan Headers
Version: N/A
URL: https://github.com/KhronosGroup/Vulkan-Headers
SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Headers.git
Date: 06/12/2018
Revision: 634e3658d6fa8f95f9062a3a7831d5567baf0eb3
Security Critical: no
License: Apache 2.0
License File: LICENSE.txt
Description:
The Vulkan Headers Components are used to by Vulkan projects. This includes the Vulkan loader,
mock ICD in the Vulkan-Tools repo, and the Vulkan Validation layers.
third_party/vulkan-loader/README.angle deleted 100644 → 0
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
Date: 05/24/2018
Revision: dba71dacd085918656a69e07fe8f37a71f5ebe2e
Security Critical: no
License: Apache 2.0
License File: 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.
third_party/vulkan-tools/README.angle deleted 100644 → 0
Name: Khronos Vulkan Tools Components
Short Name: Vulkan Mock ICD
Version: N/A
URL: https://github.com/KhronosGroup/Vulkan-Tools
SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-Tools.git
Date: 05/24/2018
Revision: 51dfb7b8a19820d6716190dd7e45cd6e861e1f1a
Security Critical: no
License: Apache 2.0
License File: LICENSE.txt
Description:
The Khronos Vulkan Tools Components contain the Vulkan Mock Installable
Client Driver (ICD) as well as the vulkaninfo utility. ANGLE is
primarily interested in the Mock ICD and uses it to run experiments
with the Mock ICD as a null driver.
third_party/vulkan-validation-layers/README.angle deleted 100644 → 0
Name: Khronos Vulkan Validation Layers Components
Short Name: Vulkan Layers
Version: N/A
URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
SOURCE CODE: git clone https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
Date: 05/24/2018
Revision: 0fe5bfe66443b288ccf19b3d4c523af7e080672c
Security Critical: no
License: Apache 2.0
License File: 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.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment