From 45ab423672f6b546d055aaf216dd6eb419f90e73 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 27 Jun 2023 16:23:30 -0400 Subject: [PATCH] Roll ANGLE from 9faf7059f9ef to 113f847be69f (2 revisions) (#43278) https://chromium.googlesource.com/angle/angle.git/+log/9faf7059f9ef..113f847be69f 2023-06-27 steven@uplinklabs.net centralize basic OS/platform detection functions 2023-06-27 abdolrashidi@google.com Vulkan: Move device OOM tests to new test suite If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/angle-flutter-engine Please CC flutter-engine@google.com,jimgraham@google.com on the revert to ensure that a human is aware of the problem. To file a bug in ANGLE: http://anglebug.com/new To file a bug in Flutter Engine: https://github.com/flutter/flutter/issues/new To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 40 ++++--------------------- sky/packages/sky_engine/LICENSE | 25 ---------------- 3 files changed, 7 insertions(+), 60 deletions(-) diff --git a/DEPS b/DEPS index 2ed8c2c0a45f5..aa8fe0194f588 100644 --- a/DEPS +++ b/DEPS @@ -635,7 +635,7 @@ deps = { Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5f9ed9b16931c7155171d31f75004f73f0a3abc8', 'src/third_party/angle': - Var('chromium_git') + '/angle/angle.git' + '@' + '9faf7059f9ef41e91f9d877445bda55be8a9d7c8', + Var('chromium_git') + '/angle/angle.git' + '@' + '113f847be69f3e813e55e6c3678a79e7483052e2', 'src/third_party/vulkan_memory_allocator': Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 1bb22e79a2d6f..e76c887e6fd9b 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: dbf878d748b3a7ba99c65b0aae9e5417 +Signature: 15c873a61d6e372ec1382c68daddfff7 ==================================================================================================== LIBRARY: angle @@ -22734,38 +22734,6 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ==================================================================================================== -==================================================================================================== -LIBRARY: systeminfo -ORIGIN: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.cpp -ORIGIN: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.h -TYPE: LicenseType.bsd -FILE: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.cpp -FILE: ../../../third_party/angle/src/third_party/systeminfo/SystemInfo.h ----------------------------------------------------------------------------------------------------- -Copyright (C) 2009 Apple Inc. All Rights Reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -==================================================================================================== - ==================================================================================================== LIBRARY: icu ORIGIN: ../../../third_party/icu/source/data/misc/icustd.txt + ../../../third_party/icu/LICENSE @@ -49007,6 +48975,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: angle ORIGIN: ../../../third_party/angle/src/common/FixedQueue.h + ../../../third_party/angle/LICENSE +ORIGIN: ../../../third_party/angle/src/common/platform_helpers.cpp + ../../../third_party/angle/LICENSE +ORIGIN: ../../../third_party/angle/src/common/platform_helpers.h + ../../../third_party/angle/LICENSE ORIGIN: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteInterpolants.cpp + ../../../third_party/angle/LICENSE ORIGIN: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteInterpolants.h + ../../../third_party/angle/LICENSE ORIGIN: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateFramebufferFetch.cpp + ../../../third_party/angle/LICENSE @@ -49035,6 +49005,8 @@ ORIGIN: ../../../third_party/angle/src/libGLESv2/egl_context_lock_autogen.h + .. ORIGIN: ../../../third_party/angle/src/libGLESv2/egl_context_lock_impl.h + ../../../third_party/angle/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/angle/src/common/FixedQueue.h +FILE: ../../../third_party/angle/src/common/platform_helpers.cpp +FILE: ../../../third_party/angle/src/common/platform_helpers.h FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteInterpolants.cpp FILE: ../../../third_party/angle/src/compiler/translator/TranslatorMetalDirect/RewriteInterpolants.h FILE: ../../../third_party/angle/src/compiler/translator/tree_ops/vulkan/EmulateFramebufferFetch.cpp @@ -66367,4 +66339,4 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. ==================================================================================================== -Total license count: 887 +Total license count: 886 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index abd7798e58465..b5b208fc9e9ea 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -11372,31 +11372,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. -------------------------------------------------------------------------------- -systeminfo - -Copyright (C) 2009 Apple Inc. All Rights Reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------------- icu Copyright (C) 2009 International Business Machines