From 0dbddc0031cee4ee4de436e22b9160ab22c91500 Mon Sep 17 00:00:00 2001 From: Yilong Li Date: Mon, 10 Jan 2022 12:05:53 -0800 Subject: [PATCH] [fuchsia] Update Vulkan header version to 1.2.198. This updates the downstream Vulkan header for Fuchsia to 1.2.198 so that it could support the upstream FUCHSIA buffer collection extension. TEST: build and no-op on Fuchsia Bug: flutter/flutter#96312 --- DEPS | 4 +- ci/licenses_golden/licenses_third_party | 57 +++++++++++++------------ 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/DEPS b/DEPS index 88fb89c78eaf8..2d1e0f9dcdf9b 100644 --- a/DEPS +++ b/DEPS @@ -414,9 +414,9 @@ deps = { 'src/third_party/vulkan': Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'v1.1.91', - # Downstream Fuchsia Vulkan Headers (v1.2.174) + # Downstream Fuchsia Vulkan Headers (v1.2.198) 'src/third_party/fuchsia-vulkan': - Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '0255987d2457576907f046c6d52b89bc6131981d', + Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '32640ad82ef648768c706c9bf828b77123a09bc2', 'src/third_party/swiftshader': Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'd4130e9ac3675dadbec8442dc2310a80ea4ddfb2', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 65bd0983b2972..7b6a88682e877 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: f651dff37e63f8affc1c1981a8032b95 +Signature: d40489cba2901e59871eb7a23cffc192 UNUSED LICENSES: @@ -1171,6 +1171,13 @@ FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/xcha FILE: ../../../third_party/expat/expat/fuzz/xml_parse_fuzzer.c FILE: ../../../third_party/expat/expat/fuzz/xml_parsebuffer_fuzzer.c FILE: ../../../third_party/fuchsia-vulkan/cmake/cmake_uninstall.cmake.in +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h264std.h +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h265std.h +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h +FILE: ../../../third_party/fuchsia-vulkan/include/vk_video/vulkan_video_codecs_common.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_icd.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_layer.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vk_platform.h @@ -1181,12 +1188,17 @@ FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_android.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_beta.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_core.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_directfb.h +FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_enums.hpp FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_fuchsia.h +FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_funcs.hpp FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_ggp.h +FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_handles.hpp FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_ios.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_macos.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_metal.h +FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_raii.hpp FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_screen.h +FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_structs.hpp FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_vi.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_wayland.h FILE: ../../../third_party/fuchsia-vulkan/include/vulkan/vulkan_win32.h @@ -9772,8 +9784,6 @@ FILE: ../../../third_party/dart/benchmarks/FfiAsTypedList/dart/FfiAsTypedList.da FILE: ../../../third_party/dart/benchmarks/FfiAsTypedList/dart2/FfiAsTypedList.dart FILE: ../../../third_party/dart/benchmarks/IsolateFibonacci/dart/IsolateFibonacci.dart FILE: ../../../third_party/dart/benchmarks/IsolateFibonacci/dart2/IsolateFibonacci.dart -FILE: ../../../third_party/dart/benchmarks/MapCopy/dart/MapCopy.dart -FILE: ../../../third_party/dart/benchmarks/MapCopy/dart2/MapCopy.dart FILE: ../../../third_party/dart/benchmarks/MapLookup/dart/MapLookup.dart FILE: ../../../third_party/dart/benchmarks/MapLookup/dart/maps.dart FILE: ../../../third_party/dart/benchmarks/MapLookup/dart2/MapLookup.dart @@ -10557,6 +10567,7 @@ FILE: ../../../third_party/dart/sdk/lib/core/core.dart FILE: ../../../third_party/dart/sdk/lib/core/double.dart FILE: ../../../third_party/dart/sdk/lib/core/errors.dart FILE: ../../../third_party/dart/sdk/lib/core/exceptions.dart +FILE: ../../../third_party/dart/sdk/lib/core/expando.dart FILE: ../../../third_party/dart/sdk/lib/core/identical.dart FILE: ../../../third_party/dart/sdk/lib/core/int.dart FILE: ../../../third_party/dart/sdk/lib/core/invocation.dart @@ -10569,7 +10580,6 @@ FILE: ../../../third_party/dart/sdk/lib/core/regexp.dart FILE: ../../../third_party/dart/sdk/lib/core/string.dart FILE: ../../../third_party/dart/sdk/lib/core/type.dart FILE: ../../../third_party/dart/sdk/lib/core/uri.dart -FILE: ../../../third_party/dart/sdk/lib/core/weak.dart FILE: ../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart FILE: ../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart FILE: ../../../third_party/dart/sdk/lib/html/html_common/conversions.dart @@ -14481,7 +14491,7 @@ THE SOFTWARE. ==================================================================================================== LIBRARY: glfw -ORIGIN: ../../../third_party/glfw/LICENSE.md +ORIGIN: ../../../third_party/glfw/COPYING.txt TYPE: LicenseType.zlib FILE: ../../../third_party/glfw/.appveyor.yml FILE: ../../../third_party/glfw/CMake/MacOSXBundleInfo.plist.in @@ -14521,10 +14531,10 @@ FILE: ../../../third_party/glfw/src/input.c FILE: ../../../third_party/glfw/src/internal.h FILE: ../../../third_party/glfw/src/linux_joystick.c FILE: ../../../third_party/glfw/src/monitor.c -FILE: ../../../third_party/glfw/src/posix_thread.c -FILE: ../../../third_party/glfw/src/posix_thread.h FILE: ../../../third_party/glfw/src/posix_time.c FILE: ../../../third_party/glfw/src/posix_time.h +FILE: ../../../third_party/glfw/src/posix_tls.c +FILE: ../../../third_party/glfw/src/posix_tls.h FILE: ../../../third_party/glfw/src/vulkan.c FILE: ../../../third_party/glfw/src/wgl_context.c FILE: ../../../third_party/glfw/src/wgl_context.h @@ -14532,8 +14542,8 @@ FILE: ../../../third_party/glfw/src/win32_init.c FILE: ../../../third_party/glfw/src/win32_joystick.c FILE: ../../../third_party/glfw/src/win32_monitor.c FILE: ../../../third_party/glfw/src/win32_platform.h -FILE: ../../../third_party/glfw/src/win32_thread.c FILE: ../../../third_party/glfw/src/win32_time.c +FILE: ../../../third_party/glfw/src/win32_tls.c FILE: ../../../third_party/glfw/src/win32_window.c FILE: ../../../third_party/glfw/src/x11_init.c FILE: ../../../third_party/glfw/src/x11_monitor.c @@ -14542,7 +14552,7 @@ FILE: ../../../third_party/glfw/src/x11_window.c FILE: ../../../third_party/glfw/src/xkb_unicode.c ---------------------------------------------------------------------------------------------------- Copyright (c) 2002-2006 Marcus Geelnard -Copyright (c) 2006-2016 Camilla Löwy +Copyright (c) 2006-2016 Camilla Berglund This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -14575,7 +14585,7 @@ FILE: ../../../third_party/glfw/src/cocoa_window.m FILE: ../../../third_party/glfw/src/nsgl_context.h FILE: ../../../third_party/glfw/src/nsgl_context.m ---------------------------------------------------------------------------------------------------- -Copyright (c) 2009-2016 Camilla Löwy +Copyright (c) 2009-2016 Camilla Berglund This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -14602,13 +14612,9 @@ LIBRARY: glfw ORIGIN: ../../../third_party/glfw/src/cocoa_joystick.h TYPE: LicenseType.zlib FILE: ../../../third_party/glfw/src/cocoa_joystick.h -FILE: ../../../third_party/glfw/src/mappings.h -FILE: ../../../third_party/glfw/src/mappings.h.in -FILE: ../../../third_party/glfw/src/null_joystick.c -FILE: ../../../third_party/glfw/src/null_joystick.h FILE: ../../../third_party/glfw/src/win32_joystick.h ---------------------------------------------------------------------------------------------------- -Copyright (c) 2006-2016 Camilla Löwy +Copyright (c) 2006-2016 Camilla Berglund This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -14636,7 +14642,7 @@ ORIGIN: ../../../third_party/glfw/src/cocoa_joystick.m TYPE: LicenseType.zlib FILE: ../../../third_party/glfw/src/cocoa_joystick.m ---------------------------------------------------------------------------------------------------- -Copyright (c) 2009-2016 Camilla Löwy +Copyright (c) 2009-2016 Camilla Berglund Copyright (c) 2012 Torsten Walluhn This software is provided 'as-is', without any express or implied @@ -14665,7 +14671,7 @@ ORIGIN: ../../../third_party/glfw/src/glfw_config.h.in TYPE: LicenseType.zlib FILE: ../../../third_party/glfw/src/glfw_config.h.in ---------------------------------------------------------------------------------------------------- -Copyright (c) 2010-2016 Camilla Löwy +Copyright (c) 2010-2016 Camilla Berglund This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -14722,17 +14728,14 @@ freely, subject to the following restrictions: ==================================================================================================== LIBRARY: glfw -ORIGIN: ../../../third_party/glfw/src/null_init.c +ORIGIN: ../../../third_party/glfw/src/mir_init.c TYPE: LicenseType.zlib -FILE: ../../../third_party/glfw/src/null_init.c -FILE: ../../../third_party/glfw/src/null_monitor.c -FILE: ../../../third_party/glfw/src/null_platform.h -FILE: ../../../third_party/glfw/src/null_window.c -FILE: ../../../third_party/glfw/src/osmesa_context.c -FILE: ../../../third_party/glfw/src/osmesa_context.h +FILE: ../../../third_party/glfw/src/mir_init.c +FILE: ../../../third_party/glfw/src/mir_monitor.c +FILE: ../../../third_party/glfw/src/mir_platform.h +FILE: ../../../third_party/glfw/src/mir_window.c ---------------------------------------------------------------------------------------------------- -Copyright (c) 2016 Google Inc. -Copyright (c) 2006-2016 Camilla Löwy +Copyright (c) 2014-2015 Brandon Schaefer This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -14761,7 +14764,7 @@ TYPE: LicenseType.zlib FILE: ../../../third_party/glfw/src/window.c ---------------------------------------------------------------------------------------------------- Copyright (c) 2002-2006 Marcus Geelnard -Copyright (c) 2006-2016 Camilla Löwy +Copyright (c) 2006-2016 Camilla Berglund Copyright (c) 2012 Torsten Walluhn This software is provided 'as-is', without any express or implied