mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-15 01:26:06 +00:00
The roll in Chromium is failing, because Dawn doesn't handle all of the new enum
values, but I cannot land the 'proper' fix in Dawn, because Chromium doesn't yet
know about the new enum values. Yay, cross dependencies.
So my solution is land the default case in Dawn, land the DEPS roll in Chromium,
then patch in the 'proper' cases in Dawn.
Roll third_party/shaderc/ a7657e4fa..95185d920 (2 commits)
a7657e4fa2..95185d920a
$ git log a7657e4fa..95185d920 --date=short --no-merges --format='%ad %ae %s'
2020-03-17 rharrison Rolling 4 dependencies (#1002)
2020-03-16 rharrison Add reflection support for storage textures (#1001)
Created with:
roll-dep third_party/shaderc
Change-Id: Id73b38643d9a6d418be9c75e218fdad7a18839bc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/17164
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
216 lines
7.0 KiB
Python
216 lines
7.0 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@f3d0ca5f46b7b190dbbdc6be508ca11dd5c54302',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'buildtools': {
|
|
'url': '{chromium_git}/chromium/src/buildtools@74cfb57006f83cfe050817526db359d5c8a11628',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'tools/clang': {
|
|
'url': '{chromium_git}/chromium/src/tools/clang@3605577b67603ec5776afcfada9e0ff4ea05cf0e',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/binutils': {
|
|
'url': '{chromium_git}/chromium/src/third_party/binutils@01aa7745b0bab64ae22600f09fd6483c60f22ebf',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# Testing, GTest and GMock
|
|
'testing': {
|
|
'url': '{chromium_git}/chromium/src/testing@2ffbbb3c8e33d51ddb3cc6b8cd10588302c33628',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/googletest': {
|
|
'url': '{chromium_git}/external/github.com/google/googletest@5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081',
|
|
'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@65aa0c35d6c2044e4be25e13e6f070caf9b75f31',
|
|
'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@25ede1ced6797f9a3689ae7dac5085ce8236c573',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/spirv-headers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@a17e17e36da44d2cd1740132ecd7a8cb078f1d15',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/glslang': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@4b2483ee88ab2ce904f6bac27c7796823c45564c',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/shaderc': {
|
|
'url': '{chromium_git}/external/github.com/google/shaderc@95185d920a0b3d5a493f6f705ad8f0245c7d55cf',
|
|
'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@06f084063fd6d9aa2ef6904517650700ae47b63d',
|
|
'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
|
|
'third_party/vulkan-headers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@d287523f48dba1b669866c5d6625b29931948e39',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# Khronos Vulkan-ValidationLayers
|
|
'third_party/vulkan-validation-layers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@237d818e81fbffa073d29d94f53a2cbac4f25b9f',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
'third_party/swiftshader': {
|
|
'url': '{swiftshader_git}/SwiftShader@51b2800bb317d9ab6026e6123c62f013dd5cf5e4',
|
|
'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',
|
|
]
|