Skip to content

Commit 27b61e7

Browse files
stuartmorgan-gstuartmorgan-g
authored
Roll ANGLE to pick up warning fixes (flutter#19105)
Rolls ANGLE forward to the latest version, picking up fixes for missing-newline-at-eof warnings.
1 parent 8e1d48e commit 27b61e7

File tree

3 files changed

+99
-20
lines changed

3 files changed

+99
-20
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ deps = {
396396
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5d1e8540407c138f47028d64684f3da599430aa4',
397397

398398
'src/third_party/angle':
399-
Var('github_git') + '/google/angle.git' + '@' + 'a56537a3d83d2eb4be6d1ae1ea074698850b1fa8',
399+
Var('github_git') + '/google/angle.git' + '@' + 'f4e6ae915edaca2dd3b0efc555c1dbbb6b8abac4',
400400

401401
'src/third_party/pkg/when':
402402
Var('dart_git') + '/when.git' + '@' + '0.2.0',

‎ci/licenses_golden/licenses_third_party

Lines changed: 64 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 13df292d0c33e43491905bb34a5476a9
1+
Signature: 96e0e2ea543ae93312100580d567ee04
22

33
UNUSED LICENSES:
44

@@ -394,10 +394,10 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/WindowSurfaceEGL.h
394394
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
395395
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
396396
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/functionsegl_typedefs.h
397-
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
398-
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
399-
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
400-
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h
397+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp
398+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.h
399+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.cpp
400+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h
401401
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/SurfaceGLX.h
402402
FILE: ../../../third_party/angle/src/libANGLE/renderer/null/BufferNULL.cpp
403403
FILE: ../../../third_party/angle/src/libANGLE/renderer/null/BufferNULL.h
@@ -645,6 +645,7 @@ FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/ang
645645
FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/common/Receiver.java
646646
FILE: ../../../third_party/angle/src/android_system_settings/src/com/android/angle/common/SearchProvider.java
647647
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_ext_provoking_vertex.h
648+
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/vk_google_filtering_precision.h
648649
FILE: ../../../third_party/angle/util/android/third_party/android_native_app_glue.c
649650
FILE: ../../../third_party/angle/util/android/third_party/android_native_app_glue.h
650651
FILE: ../../../third_party/boringssl/src/third_party/wycheproof_testvectors/METADATA
@@ -1287,7 +1288,6 @@ FILE: ../../../third_party/angle/src/common/system_utils_unittest.cpp
12871288
FILE: ../../../third_party/angle/src/common/system_utils_win32.cpp
12881289
FILE: ../../../third_party/angle/src/common/system_utils_winuwp.cpp
12891290
FILE: ../../../third_party/angle/src/common/third_party/xxhash/xxhash_fuzzer.cpp
1290-
FILE: ../../../third_party/angle/src/common/uniform_type_info_autogen.cpp
12911291
FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor.l
12921292
FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor.y
12931293
FILE: ../../../third_party/angle/src/compiler/preprocessor/preprocessor_lex_autogen.cpp
@@ -1415,8 +1415,6 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.h
14151415
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_state_cache.mm
14161416
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_utils.h
14171417
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_utils.mm
1418-
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders.inc
1419-
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc
14201418
FILE: ../../../third_party/angle/src/libANGLE/renderer/serial_utils.h
14211419
FILE: ../../../third_party/angle/src/libANGLE/renderer/serial_utils_unittest.cpp
14221420
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
@@ -1892,15 +1890,6 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/Conver
18921890
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc
18931891
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc
18941892
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc
1895-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc
1896-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc
1897-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc
1898-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc
1899-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc
1900-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc
1901-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc
1902-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc
1903-
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000010.inc
19041893
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc
19051894
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc
19061895
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc
@@ -2175,10 +2164,14 @@ FILE: ../../../third_party/angle/include/GLES2/gl2ext_explicit_context_autogen.i
21752164
FILE: ../../../third_party/angle/include/GLES3/gl31ext_explicit_context_autogen.inc
21762165
FILE: ../../../third_party/angle/include/GLES3/gl32ext_explicit_context_autogen.inc
21772166
FILE: ../../../third_party/angle/include/GLES3/gl3ext_explicit_context_autogen.inc
2167+
FILE: ../../../third_party/angle/include/platform/Platform.h
21782168
FILE: ../../../third_party/angle/src/common/PackedEGLEnums_autogen.cpp
21792169
FILE: ../../../third_party/angle/src/common/PackedEGLEnums_autogen.h
21802170
FILE: ../../../third_party/angle/src/common/PackedGLEnums_autogen.cpp
21812171
FILE: ../../../third_party/angle/src/common/PackedGLEnums_autogen.h
2172+
FILE: ../../../third_party/angle/src/common/uniform_type_info_autogen.cpp
2173+
FILE: ../../../third_party/angle/src/common/vulkan/vulkan_icd.cpp
2174+
FILE: ../../../third_party/angle/src/common/vulkan/vulkan_icd.h
21822175
FILE: ../../../third_party/angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp
21832176
FILE: ../../../third_party/angle/src/compiler/translator/ImmutableString_autogen.cpp
21842177
FILE: ../../../third_party/angle/src/compiler/translator/ParseContext_ESSL_autogen.h
@@ -2269,10 +2262,18 @@ FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.cpp
22692262
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/RendererEAGL.h
22702263
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
22712264
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
2265+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.cpp
2266+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/PixmapSurfaceGLX.h
2267+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.cpp
2268+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/glx/glx_utils.h
22722269
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/null_functions.cpp
22732270
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/null_functions.h
22742271
FILE: ../../../third_party/angle/src/libANGLE/renderer/load_functions_table_autogen.cpp
22752272
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
2273+
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders.inc
2274+
FILE: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc
2275+
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.cpp
2276+
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/CommandProcessor.h
22762277
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp
22772278
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/ProgramExecutableVk.h
22782279
FILE: ../../../third_party/angle/src/libANGLE/renderer/vulkan/mac/IOSurfaceSurfaceVkMac.h
@@ -2374,6 +2375,8 @@ FILE: ../../../third_party/angle/util/egl_loader_autogen.h
23742375
FILE: ../../../third_party/angle/util/frame_capture_utils.h
23752376
FILE: ../../../third_party/angle/util/gles_loader_autogen.cpp
23762377
FILE: ../../../third_party/angle/util/gles_loader_autogen.h
2378+
FILE: ../../../third_party/angle/util/png_utils.cpp
2379+
FILE: ../../../third_party/angle/util/png_utils.h
23772380
FILE: ../../../third_party/angle/util/windows/wgl_loader_autogen.cpp
23782381
FILE: ../../../third_party/angle/util/windows/wgl_loader_autogen.h
23792382
----------------------------------------------------------------------------------------------------
@@ -2939,7 +2942,7 @@ ORIGIN: ../../../third_party/angle/include/platform/FeaturesD3D.h + ../../../thi
29392942
TYPE: LicenseType.bsd
29402943
FILE: ../../../third_party/angle/include/platform/FeaturesD3D.h
29412944
FILE: ../../../third_party/angle/include/platform/FeaturesGL.h
2942-
FILE: ../../../third_party/angle/include/platform/Platform.h
2945+
FILE: ../../../third_party/angle/include/platform/PlatformMethods.h
29432946
FILE: ../../../third_party/angle/samples/WindowTest/WindowTest.cpp
29442947
FILE: ../../../third_party/angle/samples/multi_window/MultiWindow.cpp
29452948
FILE: ../../../third_party/angle/src/common/Optional.h
@@ -3387,6 +3390,48 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33873390
POSSIBILITY OF SUCH DAMAGE.
33883391
====================================================================================================
33893392

3393+
====================================================================================================
3394+
LIBRARY: angle
3395+
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp + ../../../third_party/angle/LICENSE
3396+
TYPE: LicenseType.bsd
3397+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.cpp
3398+
FILE: ../../../third_party/angle/src/libANGLE/renderer/gl/egl/DmaBufImageSiblingEGL.h
3399+
FILE: ../../../third_party/angle/util/fuchsia/FuchsiaPixmap.cpp
3400+
FILE: ../../../third_party/angle/util/fuchsia/FuchsiaPixmap.h
3401+
----------------------------------------------------------------------------------------------------
3402+
Copyright The ANGLE Project Authors. All rights reserved.
3403+
3404+
Redistribution and use in source and binary forms, with or without
3405+
modification, are permitted provided that the following conditions
3406+
are met:
3407+
3408+
Redistributions of source code must retain the above copyright
3409+
notice, this list of conditions and the following disclaimer.
3410+
3411+
Redistributions in binary form must reproduce the above
3412+
copyright notice, this list of conditions and the following
3413+
disclaimer in the documentation and/or other materials provided
3414+
with the distribution.
3415+
3416+
Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
3417+
Ltd., nor the names of their contributors may be used to endorse
3418+
or promote products derived from this software without specific
3419+
prior written permission.
3420+
3421+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
3422+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
3423+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
3424+
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
3425+
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
3426+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
3427+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
3428+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
3429+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
3430+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
3431+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3432+
POSSIBILITY OF SUCH DAMAGE.
3433+
====================================================================================================
3434+
33903435
====================================================================================================
33913436
LIBRARY: angle
33923437
ORIGIN: ../../../third_party/angle/src/libANGLE/renderer/metal/shaders/blit.metal + ../../../third_party/angle/LICENSE
@@ -22811,4 +22856,4 @@ freely, subject to the following restrictions:
2281122856
misrepresented as being the original software.
2281222857
3. This notice may not be removed or altered from any source distribution.
2281322858
====================================================================================================
22814-
Total license count: 359
22859+
Total license count: 360

‎sky/packages/sky_engine/LICENSE

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,40 @@ angle
580580

581581
Copyright 2020 The ANGLE Project Authors. All rights reserved.
582582

583+
Redistribution and use in source and binary forms, with or without
584+
modification, are permitted provided that the following conditions
585+
are met:
586+
587+
Redistributions of source code must retain the above copyright
588+
notice, this list of conditions and the following disclaimer.
589+
590+
Redistributions in binary form must reproduce the above
591+
copyright notice, this list of conditions and the following
592+
disclaimer in the documentation and/or other materials provided
593+
with the distribution.
594+
595+
Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
596+
Ltd., nor the names of their contributors may be used to endorse
597+
or promote products derived from this software without specific
598+
prior written permission.
599+
600+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
601+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
602+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
603+
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
604+
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
605+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
606+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
607+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
608+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
609+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
610+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
611+
POSSIBILITY OF SUCH DAMAGE.
612+
--------------------------------------------------------------------------------
613+
angle
614+
615+
Copyright The ANGLE Project Authors. All rights reserved.
616+
583617
Redistribution and use in source and binary forms, with or without
584618
modification, are permitted provided that the following conditions
585619
are met:

0 commit comments

Comments
 (0)