Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Roll ANGLE from 9faf7059f9ef to 113f847be69f (2 revisions) #43278

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
40 changes: 6 additions & 34 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: dbf878d748b3a7ba99c65b0aae9e5417
Signature: 15c873a61d6e372ec1382c68daddfff7

====================================================================================================
LIBRARY: angle
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
25 changes: 0 additions & 25 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down