mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-11 23:56:05 +00:00
The next commit in vulkan-headers contains breaking changes that removes the provisional ray-tracing extension and add the final version of it. To ease the roll past that, we first roll just before the breaking changes. A smaller scale breaking change required rolling the Vulkan Validation Layers at the same time. Roll third_party/vulkan-headers/ ced848d69..30e70cbd9 (11 commits)ced848d699..30e70cbd98
$ git log ced848d69..30e70cbd9 --date=short --no-merges --format='%ad %ae %s' 2020-11-16 jdrouan Add GGP (Stadia) WSI platform support to vk_icd.h 2020-11-15 oddhack Update for Vulkan-Docs 1.2.161 2020-11-08 oddhack Update for Vulkan-Docs 1.2.160 2020-11-01 oddhack Update for Vulkan-Docs 1.2.159 2020-10-18 oddhack Update for Vulkan-Docs 1.2.158 2020-10-12 oddhack Update for Vulkan-Docs 1.2.157 2020-10-12 oddhack Update for Vulkan-Docs 1.2.157 2020-10-04 oddhack Update for Vulkan-Docs 1.2.156 2020-09-28 oddhack Update for Vulkan-Docs 1.2.155 2020-09-21 oddhack Update for Vulkan-Docs 1.2.154 2020-09-06 oddhack Update for Vulkan-Docs 1.2.153 Created with: roll-dep third_party/vulkan-headers Roll third_party/vulkan-validation-layers/ e8b96e86f..8756b1cb9 (498 commits)e8b96e86fe..8756b1cb93
$ git log e8b96e86f..8756b1cb9 --date=short --no-merges --format='%ad %ae %s' 2020-11-25 mark threading: Check DevWaitIdle ext sync on all device queues 2020-11-25 s.fricke layers: Label VU 04563 2020-11-25 locke tests: Fix wrong descriptor type 2020-11-24 locke layers: Skip some CMD_TYPE 2020-11-23 mark tests: Add some checks for imageFormatMaybeLinear & 02259 2020-11-20 mark stateless: Calculate correct state for 02257, add 02259 2020-11-17 mark corechecks: Use named initializing for vuid structs 2020-11-17 mark drawdispatch: Use named initializing for DrawDispatch structs 2020-11-12 mark corechecks: Moved some #defines to static consts 2020-11-12 mark cmddraw: Align non-CF'd source 2020-11-19 locke layers: Attachment lifetime 2020-10-27 locke tests: Test protected, instance index, filter cubic 2020-10-26 locke layers: Validate filter cubic 2020-10-26 locke layers: Set enum for push constat byte state 2020-10-26 locke layers: Move validation for both image and sampler 2020-10-25 locke layers: Change map lastBound into array 2020-10-20 locke layers: Find Sampler in CmdBind 2020-10-23 locke layers: Validate maxMultiviewInstanceIndex 2020-11-18 locke layers: Save shared_ptr 2020-10-23 locke layers: Protected command buffer 2020-11-23 tony layers: Fix spirv-headers known good 2020-11-19 marky build: Fix clang warnings 2020-11-18 shannon build: Update known-good files for 1.2.161 header 2020-11-16 jeremyg syncval: Use correct raster order for depth/stencil resolve 2020-11-16 mark lifetimes: Correct for non-device parent objects 2020-11-13 shannon build: Reconcile VUIDs for 1.2.160 header 2020-11-13 shannon build: Update known-good files for 1.2.160 header 2020-11-16 locke tests: Using depth stencil image in both 2020-11-16 locke layers: VUID 02687 to 04584 2020-11-11 karl tests: Add test for destroyed buffer during draw validate 2020-11-11 karl layers: Remove duplicate handles from Descriptor subclasses 2020-11-16 mark repo: Update issue templates 2020-11-16 mark repo: Update issue templates 2020-11-13 pankratz layers: Removed duplicate type declaration 2020-11-13 mark scripts: Suppress warning for empty difflist 2020-11-12 mark scripts: Remove format checking shell scripts 2020-11-11 mark scripts: Add python format-checking script and update travis 2020-11-05 mark tests: Add oldSwapchain-from-different-device test 2020-11-09 mark threading: Make swapchain objects traceable to parent 2020-11-10 mark tests: Added specialuse extension BP tests 2020-11-10 mark practices: Add checking of specialuse extensions 2020-11-09 mark practices: Check for specialuse extensions and warn 2020-11-09 mark practices: Added specialuse extension table 2020-11-10 karl layers: Fix typedef and spelling 2020-11-09 jeremyg syncval: Convert enum SyncStageAccessFlags to a std::bitset 2020-11-09 jeremyg syncval: Change generated lookup tables to be const. 2020-11-06 marshall tests: Test queue retirement over timeline semaphores 2020-11-06 marshall layers: Fix queue retirement via waited-on timeline semaphores 2020-11-06 rgarcia layers: Check nullDescriptor when validating vertex attributes 2020-11-02 shannon build: Update known-good files for 1.2.159 header (...) 2020-04-07 jzulauf layers: Add support for fake device memory address 2020-04-07 locke syncval: Refactor Image encoder/generator 2020-04-06 jzulauf syncval: Cleanup/Refactor AccessContext 2020-04-03 jzulauf layers: Add range operator + and copy constructor 2020-03-20 jzulauf layers: Add subpass transition info to RP state 2020-04-03 jzulauf syncval: Clean up and bugfix Access state resolve 2020-03-25 locke syncval: Change offset generator to image generator 2020-03-17 locke syncval: Add default constructors for Encoders 2020-03-19 jzulauf syncval: Clean attachment first/last for RP creation 2020-03-18 jzulauf syncval: Add end renderpass access context resolve 2020-03-10 jzulauf syncval: Change hazard check to use resolved map. 2020-03-10 locke syncval: Add function name to hazard log messages 2020-03-04 locke tests: Test copy buffer image and blit hazards 2020-03-02 locke syncval: Add copy buffer image and blit entry points 2020-02-28 locke syncval: Use new generator in synchronization 2020-03-04 locke tests: Fix test synchronization errors 2020-03-02 locke syncval: Add dest image adjustment for compressed 2020-02-27 locke syncval: Add new RangeEncoder and RangeGenerator 2020-03-09 jzulauf syncval: Add context interface for detect/update 2020-02-21 jzulauf layers: Enhance Subpass DAG tree information 2020-02-10 jzulauf syncval: Adding race hazard support 2020-02-03 jzulauf syncval: Add logical stage extension to exec scope 2020-01-31 jzulauf sync: Add earlier/later stage maps to codegen 2020-01-23 jzulauf syncval: Add image layout transition hazard checks 2019-12-26 jzulauf tests: Add first image sync tests 2019-12-26 jzulauf syncval: Add image sync validation for CopyImage 2019-12-26 jzulauf tests: Add more flexible interface to VkImageObj 2019-12-18 jzulauf tests: Add testcases for buffer region copies 2019-09-30 jzulauf syncval: Init Sync Val Resource Hazard 2020-07-03 s.fricke tests: Add Protected Resource VUIDs 2020-07-03 s.fricke layers: Add Protected Resource VUIDs 2020-07-09 timvp build: Add a virtual dtor to AspectParameters 2020-07-08 jan-harald.fredriksen tests: Add VUID 04059 2020-07-08 jan-harald.fredriksen layers: Add VUID 04059 2020-07-09 s.fricke tests: Add YCbCr Swizzle VUIDs 2020-07-04 s.fricke layers: Add YCbCr Swizzle VUIDs 2020-07-09 tony layers: Remove leftover enum 2020-07-08 liyl chassis: Fix memory leaks 2020-07-02 lionel.g.landwerlin layers: fix image/view with modifier format feature storage 2020-07-06 shannon build: Fix VUID inconsistencies for 1.2.146 header 2020-07-06 shannon build: Update known-good files for 1.2.146 header 2020-07-08 tony layers: Fix log message 2020-07-07 tony gpu: Fix enabling of required features 2020-07-07 tony tests: Add PhysicalDeviceFeatures to device profile api 2020-07-03 s.fricke layers: Move some sparse VU to stateless 2020-07-08 40687079+rumblehhh Update BUILD.md to use correct helper.cmake path 2020-07-02 s.fricke tests: Add VUID 02711 2020-07-01 s.fricke layers: Add VUID 02711 2020-07-06 mark objtracker: Don't report undestroyable objects 2020-07-01 mark threading: Audit VkDisplay, VkDisplayMode object handling Created with: roll-dep third_party/vulkan-validation-layers Change-Id: Ie55286cecb8b7d0163a629968786195d211ea662 Bug: chromium:1153258 Change-Id: I0bb6a910c5a7d3f13731097abb1fe4b8de38c6d0 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/34143 Commit-Queue: David Neto <dneto@google.com> Reviewed-by: David Neto <dneto@google.com>
220 lines
7.2 KiB
Python
220 lines
7.2 KiB
Python
use_relative_paths = True
|
|
|
|
gclient_gn_args_file = 'build/config/gclient_args.gni'
|
|
|
|
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@787a783b9651465a131c564103b8533394f0f949',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'buildtools': {
|
|
'url': '{chromium_git}/chromium/src/buildtools@98881a1297863de584fad20fb671e8c44ad1a7d0',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'tools/clang': {
|
|
'url': '{chromium_git}/chromium/src/tools/clang@eb065289a4d96151ad9065f0234cb6754512faaf',
|
|
'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@3e2640a325dc34ec3d9cb2802b8da874aecaf52d',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/googletest': {
|
|
'url': '{chromium_git}/external/github.com/google/googletest@2828773179fa425ee406df61890a150577178ea2',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# Jinja2 and MarkupSafe for the code generator
|
|
'third_party/jinja2': {
|
|
'url': '{chromium_git}/chromium/src/third_party/jinja2@a82a4944a7f2496639f34a89c9923be5908b80aa',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/markupsafe': {
|
|
'url': '{chromium_git}/chromium/src/third_party/markupsafe@0944e71f4b2cb9a871bcbe353f95e889b64a611a',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# SPIRV-Cross
|
|
'third_party/spirv-cross': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Cross@8891bd35120ca91c252a66ccfdc3f9a9d03c70cd',
|
|
'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@60ce96e2ff10677c52ee5892519cb74d078d1592',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/spirv-headers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@060627f0b0d2fa8581b5acb939f46e3b9e500593',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/glslang': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@4dcc12d1a441b29d5901bc708bb1343d29d6459f',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/shaderc': {
|
|
'url': '{chromium_git}/external/github.com/google/shaderc@011139094ec790ff7f32ea2d80286255fc9ed18b',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
# WGSL support
|
|
'third_party/tint': {
|
|
'url': '{dawn_git}/tint@4e91325bf0c4ddab58184203aa4c1a6e46cf20f3',
|
|
'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',
|
|
},
|
|
|
|
# Khronos Vulkan headers, validation layers and loader.
|
|
'third_party/vulkan-headers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@30e70cbd9850560cb55bffadb8017e90c04c42f5',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/vulkan-validation-layers': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@8756b1cb930a6a6125dc070b01e4fce5dc6f352a',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
'third_party/vulkan-loader': {
|
|
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@d846ea5a2427eb0119cf98288aa337eced10edbd',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
'third_party/swiftshader': {
|
|
'url': '{swiftshader_git}/SwiftShader@df17a76102dfabb3f1bd6e51449cece9f77b45e3',
|
|
'condition': 'dawn_standalone',
|
|
},
|
|
|
|
}
|
|
|
|
hooks = [
|
|
# 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 Mac toolchain if possible, this makes builders use "hermetic XCode" which is
|
|
# is more consistent (only changes when rolling build/) and is cached.
|
|
'name': 'mac_toolchain',
|
|
'pattern': '.',
|
|
'condition': 'checkout_mac',
|
|
'action': ['python', 'build/mac_toolchain.py'],
|
|
},
|
|
{
|
|
# 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 clang-format binaries using checked-in hashes.
|
|
{
|
|
'name': 'clang_format_win',
|
|
'pattern': '.',
|
|
'condition': 'host_os == "win"',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-clang-format',
|
|
'-s', 'buildtools/win/clang-format.exe.sha1',
|
|
],
|
|
},
|
|
{
|
|
'name': 'clang_format_mac',
|
|
'pattern': '.',
|
|
'condition': 'host_os == "mac"',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-clang-format',
|
|
'-s', 'buildtools/mac/clang-format.sha1',
|
|
],
|
|
},
|
|
{
|
|
'name': 'clang_format_linux',
|
|
'pattern': '.',
|
|
'condition': 'host_os == "linux"',
|
|
'action': [ 'download_from_google_storage',
|
|
'--no_resume',
|
|
'--no_auth',
|
|
'--bucket', 'chromium-clang-format',
|
|
'-s', 'buildtools/linux64/clang-format.sha1',
|
|
],
|
|
},
|
|
# Update build/util/LASTCHANGE.
|
|
{
|
|
'name': 'lastchange',
|
|
'pattern': '.',
|
|
'condition': 'dawn_standalone',
|
|
'action': ['python', 'build/util/lastchange.py',
|
|
'-o', 'build/util/LASTCHANGE'],
|
|
},
|
|
]
|
|
|
|
recursedeps = [
|
|
# buildtools provides clang_format, libc++, and libc++abi
|
|
'buildtools',
|
|
]
|