aboutsummaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
m---------third_party/SwiftShader0
m---------third_party/VK-GL-CTS/src0
-rw-r--r--third_party/abseil-cpp/symbols_arm64_rel.def1
-rw-r--r--third_party/abseil-cpp/symbols_x64_rel.def2
-rw-r--r--third_party/abseil-cpp/symbols_x64_rel_asan.def3
m---------third_party/catapult0
m---------third_party/depot_tools0
-rw-r--r--third_party/vulkan-deps/DEPS14
-rw-r--r--third_party/vulkan-deps/glslang/src/README.md4
m---------third_party/vulkan-deps/spirv-cross/src0
-rw-r--r--third_party/vulkan-deps/spirv-headers/src/CMakeLists.txt5
-rw-r--r--third_party/vulkan-deps/spirv-tools/src/kokoro/scripts/windows/build.bat2
-rw-r--r--third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt2
m---------third_party/vulkan-deps/vulkan-loader/src0
m---------third_party/vulkan-deps/vulkan-tools/src0
m---------third_party/vulkan-deps/vulkan-validation-layers/src0
-rw-r--r--third_party/zlib/contrib/bench/zlib_bench.cc57
17 files changed, 64 insertions, 26 deletions
diff --git a/third_party/SwiftShader b/third_party/SwiftShader
-Subproject 1d450ae99a0f4ade28dd55dac962f8b28d99037
+Subproject 103a69bd6c82980c967c2f4002c9a302ea67c71
diff --git a/third_party/VK-GL-CTS/src b/third_party/VK-GL-CTS/src
-Subproject 20a474e64382e8f5144122b30b3d7cab182421b
+Subproject a22069b4e3b7f68cc0c161e8c93b1308bff0925
diff --git a/third_party/abseil-cpp/symbols_arm64_rel.def b/third_party/abseil-cpp/symbols_arm64_rel.def
index 5f92eee046..b78aa4011d 100644
--- a/third_party/abseil-cpp/symbols_arm64_rel.def
+++ b/third_party/abseil-cpp/symbols_arm64_rel.def
@@ -121,7 +121,6 @@ EXPORTS
??0ByAnyChar@absl@@QEAA@Vstring_view@1@@Z
??0ByLength@absl@@QEAA@_J@Z
??0ByString@absl@@QEAA@Vstring_view@1@@Z
- ??0ChunkIterator@Cord@absl@@AEAA@PEAUCordRep@cord_internal@2@@Z
??0ChunkIterator@Cord@absl@@AEAA@PEBV12@@Z
??0Condition@absl@@AEAA@XZ
??0Condition@absl@@QEAA@P6A_NPEAX@Z0@Z
diff --git a/third_party/abseil-cpp/symbols_x64_rel.def b/third_party/abseil-cpp/symbols_x64_rel.def
index 750761d4f1..17b63714ff 100644
--- a/third_party/abseil-cpp/symbols_x64_rel.def
+++ b/third_party/abseil-cpp/symbols_x64_rel.def
@@ -76,8 +76,6 @@ EXPORTS
??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@3@@Z
??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@2@@Z
- ??$ToChronoDuration@V?$duration@JV?$ratio@$0DM@$00@__1@std@@@chrono@__1@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0DM@$00@__1@std@@@chrono@__1@std@@VDuration@1@@Z
- ??$ToChronoDuration@V?$duration@JV?$ratio@$0OBA@$00@__1@std@@@chrono@__1@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0OBA@$00@__1@std@@@chrono@__1@std@@VDuration@1@@Z
??$__construct_node_hash@AEBUpiecewise_construct_t@__1@std@@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@@23@@__1@std@@AEAA?AV?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@PEAX@__1@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@PEAX@__1@std@@@__1@std@@@23@@12@_KAEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@12@$$QEAV?$tuple@$$V@12@@Z
??$__emplace_back_slow_path@AEAVstring_view@absl@@AEBV12@AEA_K@?$vector@UViableSubstitution@strings_internal@absl@@V?$allocator@UViableSubstitution@strings_internal@absl@@@__1@std@@@__1@std@@AEAAXAEAVstring_view@absl@@AEBV34@AEA_K@Z
??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@@23@@__1@std@@QEAA?AU?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@PEAX@__1@std@@@__1@std@@_N@12@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@12@AEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@12@$$QEAV?$tuple@$$V@12@@Z
diff --git a/third_party/abseil-cpp/symbols_x64_rel_asan.def b/third_party/abseil-cpp/symbols_x64_rel_asan.def
index 14daa8736d..78050362d7 100644
--- a/third_party/abseil-cpp/symbols_x64_rel_asan.def
+++ b/third_party/abseil-cpp/symbols_x64_rel_asan.def
@@ -75,8 +75,6 @@ EXPORTS
??$SetEdge@$0A@@CordRepBtree@cord_internal@absl@@QEAA?AUOpResult@012@_NPEAUCordRep@12@_K@Z
??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@std@@@absl@@YA?AV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@Vstring_view@0@AEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@3@@Z
??$StrReplaceAll@V?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@std@@@absl@@YAHAEBV?$initializer_list@U?$pair@Vstring_view@absl@@V12@@__1@std@@@std@@PEAV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@2@@Z
- ??$ToChronoDuration@V?$duration@JV?$ratio@$0DM@$00@__1@std@@@chrono@__1@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0DM@$00@__1@std@@@chrono@__1@std@@VDuration@1@@Z
- ??$ToChronoDuration@V?$duration@JV?$ratio@$0OBA@$00@__1@std@@@chrono@__1@std@@@time_internal@absl@@YA?AV?$duration@JV?$ratio@$0OBA@$00@__1@std@@@chrono@__1@std@@VDuration@1@@Z
??$__construct_at_end@PEBVFormatArgImpl@str_format_internal@absl@@@?$vector@VFormatArgImpl@str_format_internal@absl@@V?$allocator@VFormatArgImpl@str_format_internal@absl@@@__1@std@@@__1@std@@AEAAXPEBVFormatArgImpl@str_format_internal@absl@@0_K@Z
??$__construct_node_hash@AEBUpiecewise_construct_t@__1@std@@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@@23@@__1@std@@AEAA?AV?$unique_ptr@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@PEAX@__1@std@@V?$__hash_node_destructor@V?$allocator@U?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@PEAX@__1@std@@@__1@std@@@23@@12@_KAEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@12@$$QEAV?$tuple@$$V@12@@Z
??$__emplace_unique_key_args@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@AEBUpiecewise_construct_t@23@V?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@V?$tuple@$$V@23@@?$__hash_table@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@V?$__unordered_map_hasher@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$__unordered_map_equal@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@23@U?$equal_to@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@U?$hash@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@23@$00@23@V?$allocator@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@@23@@__1@std@@QEAA?AU?$pair@V?$__hash_iterator@PEAU?$__hash_node@U?$__hash_value_type@V?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@PEBVImpl@time_zone@cctz@time_internal@absl@@@__1@std@@PEAX@__1@std@@@__1@std@@_N@12@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@12@AEBUpiecewise_construct_t@12@$$QEAV?$tuple@AEBV?$basic_string@DU?$char_traits@D@__1@std@@V?$allocator@D@23@@__1@std@@@12@$$QEAV?$tuple@$$V@12@@Z
@@ -403,7 +401,6 @@ EXPORTS
?Find@ByChar@absl@@QEBA?AVstring_view@2@V32@_K@Z
?Find@ByLength@absl@@QEBA?AVstring_view@2@V32@_K@Z
?Find@ByString@absl@@QEBA?AVstring_view@2@V32@_K@Z
- ?FindFlatStartPiece@InlineRep@Cord@absl@@QEBA?AVstring_view@3@XZ
?FindPath@GraphCycles@synchronization_internal@absl@@QEBAHUGraphId@23@0HQEAU423@@Z
?FindSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
?FindTailSlow@CordRepRing@cord_internal@absl@@AEBA?AUPosition@123@I_K@Z
diff --git a/third_party/catapult b/third_party/catapult
-Subproject e9e999a4a88a2963b60bec778f340d3c3d00fa1
+Subproject 28b8ede735b79253b8689d5e270f4783e841364
diff --git a/third_party/depot_tools b/third_party/depot_tools
-Subproject 3c6f0eb95fddb6833820d3a10e80a7a2fb5d016
+Subproject 7d2693ad8d9d304391b1c1fee9f88f258af5a21
diff --git a/third_party/vulkan-deps/DEPS b/third_party/vulkan-deps/DEPS
index fe2bf88281..e9a9953ef2 100644
--- a/third_party/vulkan-deps/DEPS
+++ b/third_party/vulkan-deps/DEPS
@@ -9,28 +9,28 @@ vars = {
'chromium_git': 'https://chromium.googlesource.com',
# Current revision of glslang, the Khronos SPIRV compiler.
- 'glslang_revision': '48fd6c82b3fefb38e59dd799d8b12fddddf8e63c',
+ 'glslang_revision': '06ac14141222bc059f48609b9a4a68fdb6fc4814',
# Current revision of spirv-cross, the Khronos SPIRV cross compiler.
- 'spirv_cross_revision': '6a67891418a3f08be63f92726e049dc788e46f5b',
+ 'spirv_cross_revision': '779138f39fa33f6fe6dab2e3b21938884f74a4bb',
# Current revision fo the SPIRV-Headers Vulkan support library.
- 'spirv_headers_revision': '9c3fd01c8a91761b6e4be97ff4f13de76e779128',
+ 'spirv_headers_revision': '82becc8a8a92e509d3d8d635889da0a3c17d0606',
# Current revision of SPIRV-Tools for Vulkan.
- 'spirv_tools_revision': '92c17edde79a3afae2aee810da4ce03bc7088531',
+ 'spirv_tools_revision': 'cb96abbf7affd986016f17dd09f9f971138a922b',
# Current revision of Khronos Vulkan-Headers.
'vulkan_headers_revision': '76f00ef6cbb1886eb1162d1fa39bee8b51e22ee8',
# Current revision of Khronos Vulkan-Loader.
- 'vulkan_loader_revision': 'f503824ff8cbecfe39fb96ac89cbe959355dc311',
+ 'vulkan_loader_revision': '71bd6240afaef2c199b47f26d715091fa6fdf4f8',
# Current revision of Khronos Vulkan-Tools.
- 'vulkan_tools_revision': '5f3ce24e7a530d089842c8192c2565a672555250',
+ 'vulkan_tools_revision': 'ef20059aea7ec24d0842edca2f75255eaa33a7b0',
# Current revision of Khronos Vulkan-ValidationLayers.
- 'vulkan_validation_revision': '5501a60aa6d6d1d8d35aaa4a7c0bdda02a0108db',
+ 'vulkan_validation_revision': '8a6fe16b4a1bb1f26385991d61ab1169d2284776',
}
deps = {
diff --git a/third_party/vulkan-deps/glslang/src/README.md b/third_party/vulkan-deps/glslang/src/README.md
index 48118b2943..efe986cab2 100644
--- a/third_party/vulkan-deps/glslang/src/README.md
+++ b/third_party/vulkan-deps/glslang/src/README.md
@@ -169,8 +169,8 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(pwd)/install" $SOURCE
For building on Android:
```bash
-cmake $SOURCE_DIR -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DANDROID_ABI=arm64-v8a -DCMAKE_BUILD_TYPE=Release -DANDROID_STL=c++_static -DANDROID_PLATFORM=android-24 -DCMAKE_SYSTEM_NAME=Android -DANDROID_TOOLCHAIN=clang -DANDROID_ARM_MODE=arm -DCMAKE_MAKE_PROGRAM=$ANDROID_NDK_ROOT/prebuilt/linux-x86_64/bin/make -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake
-# If on Windows will be -DCMAKE_MAKE_PROGRAM=%ANDROID_NDK_ROOT%\prebuilt\windows-x86_64\bin\make.exe
+cmake $SOURCE_DIR -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$(pwd)/install" -DANDROID_ABI=arm64-v8a -DCMAKE_BUILD_TYPE=Release -DANDROID_STL=c++_static -DANDROID_PLATFORM=android-24 -DCMAKE_SYSTEM_NAME=Android -DANDROID_TOOLCHAIN=clang -DANDROID_ARM_MODE=arm -DCMAKE_MAKE_PROGRAM=$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake
+# If on Windows will be -DCMAKE_MAKE_PROGRAM=%ANDROID_NDK_HOME%\prebuilt\windows-x86_64\bin\make.exe
# -G is needed for building on Windows
# -DANDROID_ABI can also be armeabi-v7a for 32 bit
```
diff --git a/third_party/vulkan-deps/spirv-cross/src b/third_party/vulkan-deps/spirv-cross/src
-Subproject 6a67891418a3f08be63f92726e049dc788e46f5
+Subproject 779138f39fa33f6fe6dab2e3b21938884f74a4b
diff --git a/third_party/vulkan-deps/spirv-headers/src/CMakeLists.txt b/third_party/vulkan-deps/spirv-headers/src/CMakeLists.txt
index f19390aadf..147f7adeee 100644
--- a/third_party/vulkan-deps/spirv-headers/src/CMakeLists.txt
+++ b/third_party/vulkan-deps/spirv-headers/src/CMakeLists.txt
@@ -89,9 +89,14 @@ if (SPIRV_HEADERS_ENABLE_INSTALL)
set(namespace "${PROJECT_NAME}::")
include(CMakePackageConfigHelpers)
+
+ if (NOT CMAKE_VERSION VERSION_LESS 3.14)
+ set(arch_independent_str ARCH_INDEPENDENT)
+ endif()
write_basic_package_version_file(
"${version_config}"
COMPATIBILITY SameMajorVersion
+ ${arch_independent_str}
)
configure_package_config_file(
diff --git a/third_party/vulkan-deps/spirv-tools/src/kokoro/scripts/windows/build.bat b/third_party/vulkan-deps/spirv-tools/src/kokoro/scripts/windows/build.bat
index 24e29ccf08..8c9d6892c2 100644
--- a/third_party/vulkan-deps/spirv-tools/src/kokoro/scripts/windows/build.bat
+++ b/third_party/vulkan-deps/spirv-tools/src/kokoro/scripts/windows/build.bat
@@ -22,7 +22,7 @@ set BUILD_TYPE=%1
set VS_VERSION=%2
:: Force usage of python 3.6
-set PATH=C:\python36;"C:\Program Files\CMake\bin";%PATH%
+set PATH=C:\python36;"C:\Program Files\cmake-3.23.1-windows-x86_64\bin";%PATH%
cd %SRC%
git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers
diff --git a/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt b/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt
index ab411737eb..98559b8fe9 100644
--- a/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt
+++ b/third_party/vulkan-deps/spirv-tools/src/source/CMakeLists.txt
@@ -407,7 +407,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
find_library(LIBRT rt)
if(LIBRT)
foreach(target ${SPIRV_TOOLS_TARGETS})
- target_link_libraries(${target} ${LIBRT})
+ target_link_libraries(${target} rt)
endforeach()
endif()
endif()
diff --git a/third_party/vulkan-deps/vulkan-loader/src b/third_party/vulkan-deps/vulkan-loader/src
-Subproject f503824ff8cbecfe39fb96ac89cbe959355dc31
+Subproject 71bd6240afaef2c199b47f26d715091fa6fdf4f
diff --git a/third_party/vulkan-deps/vulkan-tools/src b/third_party/vulkan-deps/vulkan-tools/src
-Subproject 5f3ce24e7a530d089842c8192c2565a67255525
+Subproject ef20059aea7ec24d0842edca2f75255eaa33a7b
diff --git a/third_party/vulkan-deps/vulkan-validation-layers/src b/third_party/vulkan-deps/vulkan-validation-layers/src
-Subproject 5501a60aa6d6d1d8d35aaa4a7c0bdda02a0108d
+Subproject 8a6fe16b4a1bb1f26385991d61ab1169d228477
diff --git a/third_party/zlib/contrib/bench/zlib_bench.cc b/third_party/zlib/contrib/bench/zlib_bench.cc
index 252560ea9e..fcb28486e1 100644
--- a/third_party/zlib/contrib/bench/zlib_bench.cc
+++ b/third_party/zlib/contrib/bench/zlib_bench.cc
@@ -193,7 +193,34 @@ void verify_equal(const char* input, size_t size, std::string* output) {
exit(3);
}
-void zlib_file(const char* name, const zlib_wrapper type, int width) {
+void check_file(const Data& file, zlib_wrapper type) {
+ std::string compressed;
+ zlib_compress(type, file.data.get(), file.size, &compressed, true);
+
+ unsigned long check = crc32_z(0, Z_NULL, 0);
+ const Bytef* data = (const Bytef*)compressed.data();
+ static_assert(sizeof(z_size_t) == sizeof(size_t), "z_size_t size");
+ check = crc32_z(check, data, (z_size_t)compressed.size());
+
+ const size_t compressed_length = compressed.size();
+ printf("data crc32 %.8lx length %zu\n", check, compressed_length);
+
+ if (type == kWrapperGZIP) {
+ uint32_t prev_word, last_word;
+ data += compressed_length - 8;
+ prev_word = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0];
+ data += 4; // last compressed data word
+ last_word = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0];
+ printf("gzip crc32 %.8x length %u\n", prev_word, last_word);
+ } else if (type == kWrapperZLIB) {
+ uint32_t last_word;
+ data += compressed_length - 4;
+ last_word = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
+ printf("zlib adler %.8x\n", last_word);
+ }
+}
+
+void zlib_file(const char* name, zlib_wrapper type, int width, int check) {
/*
* Read the file data.
*/
@@ -208,6 +235,14 @@ void zlib_file(const char* name, const zlib_wrapper type, int width) {
printf("%s%-40s :\n", strategy, name);
/*
+ * Compress file: report output data checks.
+ */
+ if (check) {
+ check_file(file, type);
+ return;
+ }
+
+ /*
* Chop the data into blocks.
*/
const int block_size = 1 << 20;
@@ -311,9 +346,10 @@ void get_field_width(int argc, char* argv[], int& value) {
}
void usage_exit(const char* program) {
- static auto* options =
- "gzip|zlib|raw [--compression 0:9] [--huffman|--rle] [--field width]";
+ static auto* options = "gzip|zlib|raw"
+ " [--compression 0:9] [--huffman|--rle] [--field width] [--check]";
printf("usage: %s %s files ...\n", program, options);
+ printf("zlib version: %s\n", ZLIB_VERSION);
exit(1);
}
@@ -328,18 +364,21 @@ int main(int argc, char* argv[]) {
else
usage_exit(argv[0]);
- int file_size_field_width = 0;
+ int size_field_width = 0;
+ int file_check = 0;
while (argn < argc && argv[argn][0] == '-') {
if (get_option(argc, argv, "--compression")) {
if (!get_compression(argc, argv, zlib_compression_level))
usage_exit(argv[0]);
- } else if (get_option(argc, argv, "--field")) {
- get_field_width(argc, argv, file_size_field_width);
} else if (get_option(argc, argv, "--huffman")) {
zlib_strategy = Z_HUFFMAN_ONLY;
} else if (get_option(argc, argv, "--rle")) {
zlib_strategy = Z_RLE;
+ } else if (get_option(argc, argv, "--check")) {
+ file_check = 1;
+ } else if (get_option(argc, argv, "--field")) {
+ get_field_width(argc, argv, size_field_width);
} else {
usage_exit(argv[0]);
}
@@ -348,10 +387,10 @@ int main(int argc, char* argv[]) {
if (argn >= argc)
usage_exit(argv[0]);
- if (file_size_field_width < 6)
- file_size_field_width = 6;
+ if (size_field_width < 6)
+ size_field_width = 6;
while (argn < argc)
- zlib_file(argv[argn++], type, file_size_field_width);
+ zlib_file(argv[argn++], type, size_field_width, file_check);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 04:16:37 +0000