mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-07 13:45:51 +00:00
Roll third_party/SPIRV-Tools/ c8590c18b..95df4c964 (16 commits)c8590c18bd..95df4c9643
$ git log c8590c18b..95df4c964 --date=short --no-merges --format='%ad %ae %s' 2020-05-19 rharrison Add in a bunch of missed files to the BUILD.gn (#3360) 2020-05-19 rharrison Remove stale entries from BUILD.gn (#3358) 2020-05-19 vladimir.davidovich allow cross compiling for Windows Store, UWP, etc. (#3330) 2020-05-19 vasniktel spirv-fuzz: Remove FuzzerPassAddUsefulConstructs (#3341) 2020-05-19 vasniktel Add support for StorageBuffer (#3348) 2020-05-19 462213+sl1pkn07 Prevent Effcee install his things when build spirv-tools with testing enabled (#3256) 2020-05-19 stevenperron Don't register edges twice in merge return (#3350) 2020-05-14 stevenperron Revert "Revert "[spirv-opt] refactor inlining pass (#3328)" (#3342)" (#3345) 2020-05-14 afdx spirv-reduce: Remove unused struct members (#3329) 2020-05-14 andreperezmaselco.developer Add adjust branch weights transformation (#3336) 2020-05-13 stevenperron Revert "[spirv-opt] refactor inlining pass (#3328)" (#3342) 2020-05-13 jaebaek [spirv-opt] refactor inlining pass (#3328) 2020-05-13 afdx spirv-reduce: Remove unused uniforms and similar (#3321) 2020-05-13 afdx spirv-fuzz: Fix to fact manager (#3339) 2020-05-13 afdx spirv-fuzz: Get rid of unnecessary template method (#3340) 2020-05-12 stevenperron Do merge return if the return is not at the end of the function. (#3337) Roll third_party/glslang/ 4fa68edd6..2e0f0a051 (9 commits)4fa68edd68..2e0f0a0517
$ git log 4fa68edd6..2e0f0a051 --date=short --no-merges --format='%ad %ae %s' 2020-05-20 cepheus Fix #2227, which was coded incorrectly, to be simpler/safer. 2020-05-19 cepheus Build: Fix #2228, by correcting the type used. 2020-05-20 lryer Code refine. (#2227) 2020-05-18 laddoc Add check for DOUBLE in low versions (#2223) 2020-05-18 greg Flatten all interface variables (#2217) 2020-05-18 cepheus Bump version. 2020-05-15 lryer Reserve unused std140 uniform block in reflection, and fix uniform block matrix layout (#2041) 2020-05-15 cepheus Bump version. 2020-05-14 duke.acacia Move to newer version of SPIRV-Tools Roll third_party/spirv-cross/ d638d2df9..29ad40e93 (4 commits)d638d2df9c..29ad40e93e
$ git log d638d2df9..29ad40e93 --date=short --no-merges --format='%ad %ae %s' 2020-05-20 post GLSL: Add more test shaders for hit attribute types. 2020-05-20 post GLSL: Support ray payloads and hit attributes declared as Block. 2020-05-20 post GLSL: Add some more focused RT test shaders. 2020-05-19 post HLSL: Implement image queries for UAV images. Roll third_party/tint/ 0bbf1e746..1bbc1cb2c (6 commits) https://dawn.googlesource.com/tint/+log/0bbf1e746093..1bbc1cb2c122 $ git log 0bbf1e746..1bbc1cb2c --date=short --no-merges --format='%ad %ae %s' 2020-05-19 dneto [spirv-reader] Support null vector, matrix, arr, struct 2020-05-19 dneto [spirv-reader] Systematic bad construct exit tests 2020-05-19 dneto [spirv-reader] Remove TODO about nested selections 2020-05-19 dneto [spirv-reader] remove redundant disabled test 2020-05-14 dneto [spirv-reader] Unordered float compares 2020-05-14 rharrison Add include path to public config for BUILD.gn Created with: roll-dep third_party/SPIRV-Tools third_party/glslang third_party/shaderc third_party/spirv-cross third_party/spirv-headers third_party/tint Change-Id: I4f7ff976bdd1527680c9c1f0bc7fdf6cd581ec4c Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/22022 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
234 lines
7.6 KiB
Python
234 lines
7.6 KiB
Python
use_relative_paths = True
|
|
use_relative_hooks = True
|
|
|
|
vars = {
|
|
'chromium_git': 'https://chromium.googlesource.com',
|
|
'dawn_git': 'https://dawn.googlesource.com',
|
|
'github_git': 'https://github.com',
|
|
'swiftshader_git': 'https://swiftshader.googlesource.com',
|
|
|
|
'dawn_standalone': True,
|
|
}
|
|
|
|
deps = {
|
|
# Dependencies required to use GN/Clang in standalone
|
|
'build': {
|
|
'url': '{chromium_git}/chromium/src/build@896323eeda1bd1b01156b70625d5e14de225ebc3',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'buildtools': {
|
|
'url': '{chromium_git}/chromium/src/buildtools@2c41dfb19abe40908834803b6fed797b0f341fe1',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'tools/clang': {
|
|
'url': '{chromium_git}/chromium/src/tools/clang@698732d5db36040c07d5cc5f9137fcc943494c11',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/binutils': {
|
|
'url': '{chromium_git}/chromium/src/third_party/binutils@f9ce777698a819dff4d6a033b31122d91a49b62e',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'tools/clang/dsymutil': {
|
|
'packages': [
|
|
{
|
|
'package': 'chromium/llvm-build-tools/dsymutil',
|
|
'version': 'M56jPzDv1620Rnm__jTMYS62Zi8rxHVq7yw0qeBFEgkC',
|
|
}
|
|
],
|
|
'condition': 'checkout_mac or checkout_ios',
|
|
'dep_type': 'cipd',
|
|
},
|
|
|
|
# Testing, GTest and GMock
|
|
'testing': {
|
|
'url': '{chromium_git}/chromium/src/testing@e5ced5141379ee8ae28b4f93d3c02df039d2b052',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/googletest': {
|
|
'url': '{chromium_git}/external/github.com/google/googletest@a09ea700d32bab83325aff9ff34d0582e50e3997',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# Jinja2 and MarkupSafe for the code generator
|
|
'third_party/jinja2': {
|
|
'url': '{chromium_git}/chromium/src/third_party/jinja2@b41863e42637544c2941b574c7877d3e1f663e25',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/markupsafe': {
|
|
'url': '{chromium_git}/chromium/src/third_party/markupsafe@8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# SPIRV-Cross
|
|
'third_party/spirv-cross': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@29ad40e93ed826cfa04da0326a0cfd8717f88583',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# SPIRV compiler dependencies: SPIRV-Tools, SPIRV-headers, glslang and shaderc
|
|
'third_party/SPIRV-Tools': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@95df4c9643cd440187d652c24d463c1c7dd99a91',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/spirv-headers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@c0df742ec0b8178ad58c68cff3437ad4b6a06e26',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/glslang': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@2e0f0a0517e4251ac8e0d6fd46e92af33fcb800d',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/shaderc': {
|
|
'url': '{chromium_git}/external/github.com/google/shaderc@00ac5d82178cfb5679fe19194d5794fdb01cdd00',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# WGSL support
|
|
'third_party/tint': {
|
|
'url': '{dawn_git}/tint@1bbc1cb2c122dae6ba854839b8327081a508c778',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# GLFW for tests and samples
|
|
'third_party/glfw': {
|
|
'url': '{chromium_git}/external/github.com/glfw/glfw@d973acc123826666ecc9e6fd475682e3d84c54a6',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# Dependencies for samples: GLM
|
|
'third_party/glm': {
|
|
'url': '{github_git}/g-truc/glm.git@bf71a834948186f4097caa076cd2663c69a10e1e',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# Our own pre-compiled Linux clang-format 7.0 for presubmit
|
|
'third_party/clang-format': {
|
|
'url': '{dawn_git}/clang-format@2451c56cd368676cdb230fd5ad11731ab859f1a3',
|
|
'condition': 'dawn_standalone and checkout_linux',
|
|
},
|
|
|
|
# Khronos Vulkan headers, validation layers and loader.
|
|
'third_party/vulkan-headers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@e01f13e1f777cf592ebd1a5f4836d4cd10ed85f6',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/vulkan-validation-layers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@7e1fb3d60265177b7a3932fad6800b6ea4c3104b',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/vulkan-loader': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@50eaecd721a2280a3eb9366c50c4b19e75d7e53e',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
'third_party/swiftshader': {
|
|
'url': '{swiftshader_git}/SwiftShader@d25ce872522427bd7a957acf7126dc5aae9d26fc',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
}
|
|
|
|
hooks = [
|
|
# Pull clang-format binaries using checked-in hashes.
|
|
{
|
|
'name': 'clang_format_win',
|
|
'pattern': '.',
|
|
'condition': 'host_os == "win" and dawn_standalone',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--platform=win32',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-clang-format',
|
|
'-s', 'buildtools/win/clang-format.exe.sha1',
|
|
],
|
|
},
|
|
{
|
|
'name': 'clang_format_mac',
|
|
'pattern': '.',
|
|
'condition': 'host_os == "mac" and dawn_standalone',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--platform=darwin',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-clang-format',
|
|
'-s', 'buildtools/mac/clang-format.sha1',
|
|
],
|
|
},
|
|
{
|
|
'name': 'clang_format_linux',
|
|
'pattern': '.',
|
|
'condition': 'host_os == "linux" and dawn_standalone',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--platform=linux*',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-clang-format',
|
|
'-s', 'buildtools/linux64/clang-format.sha1',
|
|
],
|
|
},
|
|
|
|
# Pull the compilers and system libraries for hermetic builds
|
|
{
|
|
'name': 'sysroot_x86',
|
|
'pattern': '.',
|
|
'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and dawn_standalone)',
|
|
'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--arch=x86'],
|
|
},
|
|
{
|
|
'name': 'sysroot_x64',
|
|
'pattern': '.',
|
|
'condition': 'checkout_linux and (checkout_x64 and dawn_standalone)',
|
|
'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py',
|
|
'--arch=x64'],
|
|
},
|
|
{
|
|
# Update the Windows toolchain if necessary. Must run before 'clang' below.
|
|
'name': 'win_toolchain',
|
|
'pattern': '.',
|
|
'condition': 'checkout_win and dawn_standalone',
|
|
'action': ['python', 'build/vs_toolchain.py', 'update', '--force'],
|
|
},
|
|
{
|
|
# Note: On Win, this should run after win_toolchain, as it may use it.
|
|
'name': 'clang',
|
|
'pattern': '.',
|
|
'action': ['python', 'tools/clang/scripts/update.py'],
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
{
|
|
# Pull rc binaries using checked-in hashes.
|
|
'name': 'rc_win',
|
|
'pattern': '.',
|
|
'condition': 'checkout_win and (host_os == "win" and dawn_standalone)',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-browser-clang/rc',
|
|
'-s', 'build/toolchain/win/rc/win/rc.exe.sha1',
|
|
],
|
|
},
|
|
# Pull binutils for linux hermetic builds
|
|
{
|
|
'name': 'binutils',
|
|
'pattern': 'src/third_party/binutils',
|
|
'condition': 'host_os == "linux"',
|
|
'action': [
|
|
'python',
|
|
'third_party/binutils/download.py',
|
|
],
|
|
},
|
|
# Update build/util/LASTCHANGE.
|
|
{
|
|
'name': 'lastchange',
|
|
'pattern': '.',
|
|
'action': ['python', 'build/util/lastchange.py',
|
|
'-o', 'build/util/LASTCHANGE'],
|
|
},
|
|
]
|
|
|
|
recursedeps = [
|
|
# buildtools provides clang_format, libc++, and libc++abi
|
|
'buildtools',
|
|
]
|