Skip to content

Commit

Permalink
Update ANGLE to 2024-02-24 (acba61cb3e27f15b56ca781813efa357b9ca0f1f)
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=270059
rdar://113646547

Reviewed by Kimmo Kinnunen

Contains upstream commits:
git log --oneline 40dfb3a8bd6514b613ce693962c6d8dcd70ab25a..acba61cb3e27f15b56ca781813efa357b9ca0f1f --pretty=%h %s
acba61cb3e Fix Vulkan driver version for Win/Intel
c758dc03c4 GL: Adjust disableRenderSnorm condition
6a88437dc1 Roll VK-GL-CTS from cf5313984f57 to d15e5faec700 (1 revision)
db88630858 Roll VK-GL-CTS from c402aa4fc1f1 to cf5313984f57 (7 revisions)
bd1b918a5a Roll vulkan-deps from 004d9803b30c to 602ab4120d74 (6 revisions)
33a3395599 Roll Chromium from cc824ffe820c to b54ff9b1d5ed (616 revisions)
5a4bfd61fd Metal: Separate struct definition from function return
7f29c70360 Roll vulkan-deps from b040470c0fde to 004d9803b30c (5 revisions)
b06dbffd1c Roll Chromium from 5f0b8ba66cd4 to cc824ffe820c (635 revisions)
cd63c5d477 Fix build failures targetting iOS 17.4
8c503c1b05 Add skip for 07753 validation error in trace
bcf814fda5 Vulkan: Constrain the dependency on ContextVk in BufferHelper
f43b9f87cf Roll vulkan-deps from 5fa0abb9413b to b040470c0fde (5 revisions)
0f6386a82e Roll Chromium from 98827507560a to 5f0b8ba66cd4 (624 revisions)
f546983cc8 Add test and skip for 07753 validation error
8346addbd0 Contain X11 includes and free usage of common terms
1ee04579b4 Metal: Re-enable asm inejction into loops on MacOS 12+
21c0d31cd6 OpenCL: Only build clspv for Vk backend
b7bacdb746 GL: Generate mipmaps through draw calls on Pixel7/Pixel8.
2b1ef00ad5 Metal: Fix validation for anonymous struct arrays
19e21b1e0b OpenCL/Vulkan: Add initial support for cmdQueue
f4d5644c9f Instantiate dawn backend in angle_end2end_tests
b7d0a18bb1 Roll vulkan-deps from 13783d616289 to 5fa0abb9413b (10 revisions)
9f16b585cb Roll Chromium from 2905059a5737 to 98827507560a (299 revisions)
e17dd5a408 Roll vulkan-deps from 063ea20a64fc to 13783d616289 (25 revisions)
e3badd04cc Roll Chromium from 9d4a35b46e1e to 2905059a5737 (725 revisions)
e04b7c7392 Vulkan: Expand feature to enable sample usage for all AHBs
e08e82b6de CL: On kernel arg validation use right sizes
9d453e579e Fix ASSERT in non-global precise var decls
bde26cc4de Roll VK-GL-CTS from b9ec0d4bdf99 to c402aa4fc1f1 (13 revisions)
372876879b Android: support running angle_unittests via android_helper
a6616081f2 Add missing include
af56ca61bb OpenCL/Vulkan: Initial support for context
298abbc156 Roll Chromium from 29bec8631d2f to 9d4a35b46e1e (1220 revisions)
3ca8befb24 Vulkan: Handle multi-context apps in pipeline cache graphs
6607a2b98d Vulkan: Add support for VK_EXT_vertex_input_dynamic_state
bff0b1e43d Change enum value for webgpu to unused value.
6d4706bfb9 WGPU: Add a angle_dawn_dir build override.
aa244358af Reland "Vulkan: Get rid of X11 include in DisplayVkXcb.cpp"
6d589ff6a3 Trace perf: support custom thermal throttling for tests
ec2603d69f Fix build in absence of SSE support

b380ed1f98 Vulkan: Add EGL_ANGLE_global_fence_sync
Canonical link: https://commits.webkit.org/275313@main
  • Loading branch information
djg authored and kkinnunen-apple committed Feb 26, 2024
1 parent b560a1b commit a2066e9
Show file tree
Hide file tree
Showing 140 changed files with 1,877 additions and 515 deletions.
6 changes: 3 additions & 3 deletions Source/ThirdParty/ANGLE/ANGLE.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<key>OpenSourceProject</key>
<string>ANGLE</string>
<key>OpenSourceVersion</key>
<string>40dfb3a8bd6514b613ce693962c6d8dcd70ab25a</string>
<string>acba61cb3e27f15b56ca781813efa357b9ca0f1f</string>
<key>OpenSourceWebsiteURL</key>
<string>http://code.google.com/p/angleproject/</string>
<key>OpenSourceSCM</key>
<string>git clone https://chromium.googlesource.com/angle/angle &amp;&amp; cd angle &amp;&amp; git checkout 40dfb3a8bd6514b613ce693962c6d8dcd70ab25a</string>
<string>git clone https://chromium.googlesource.com/angle/angle &amp;&amp; cd angle &amp;&amp; git checkout acba61cb3e27f15b56ca781813efa357b9ca0f1f</string>
<key>OpenSourceImportDate</key>
<string>2024-02-15</string>
<string>2024-02-26</string>
<key>OpenSourceLicense</key>
<string>BSD</string>
<key>OpenSourceLicenseFile</key>
Expand Down
8 changes: 8 additions & 0 deletions Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,8 @@
31CDFFFD249184B000486F27 /* imageformats.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD598B2284FC400018F2D8 /* imageformats.h */; };
31CDFFFE249184B000486F27 /* copyimage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD59862284FC400018F2D8 /* copyimage.h */; };
31CDFFFF249184B000486F27 /* generatemip.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD598C2284FC400018F2D8 /* generatemip.h */; };
3A084D472B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A084D452B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.h */; };
3A084D482B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3A084D462B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.cpp */; };
3A0EBF992980B495002C72BC /* logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A0EBF812980B445002C72BC /* logging.h */; };
3A0EBF9A2980B495002C72BC /* sys_byteorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A0EBF822980B445002C72BC /* sys_byteorder.h */; };
3A0EBF9B2980B49D002C72BC /* sha1.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A0EBF942980B445002C72BC /* sha1.h */; };
Expand Down Expand Up @@ -1032,6 +1034,8 @@
31B15721236B803300CAA4FD /* SystemInfo_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemInfo_internal.h; sourceTree = "<group>"; };
31CDFDEE24917F8900486F27 /* ANGLE-dynamic.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ANGLE-dynamic.xcconfig"; sourceTree = "<group>"; };
31CDFDF42491819E00486F27 /* libANGLE-shared.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libANGLE-shared.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
3A084D452B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeparateStructFromFunctionDeclarations.h; sourceTree = "<group>"; };
3A084D462B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SeparateStructFromFunctionDeclarations.cpp; sourceTree = "<group>"; };
3A0EBF802980B445002C72BC /* trace_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trace_event.h; sourceTree = "<group>"; };
3A0EBF812980B445002C72BC /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = "<group>"; };
3A0EBF822980B445002C72BC /* sys_byteorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sys_byteorder.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2683,6 +2687,8 @@
5C55D62B22826B9700B5BA2C /* RewriteTexelFetchOffset.h */,
5C55D60322826B9000B5BA2C /* SeparateDeclarations.cpp */,
5C55D61422826B9100B5BA2C /* SeparateDeclarations.h */,
3A084D462B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.cpp */,
3A084D452B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.h */,
FF194FD427432CC2006A97A3 /* SeparateStructFromUniformDeclarations.cpp */,
FF194FD627432CC2006A97A3 /* SeparateStructFromUniformDeclarations.h */,
5C55D61722826B9200B5BA2C /* SimplifyLoopConditions.cpp */,
Expand Down Expand Up @@ -3614,6 +3620,7 @@
7B359DA82A7CEDAA0016DC59 /* RewriteInterpolants.h in Headers */,
7B359D9F2A7CEDAA0016DC59 /* RewriteOutArgs.h in Headers */,
7B7608352898326C000012A1 /* RewritePixelLocalStorage.h in Headers */,
3A084D472B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.h in Headers */,
7B359D6F2A7CED3C0016DC59 /* RewriteRepeatedAssignToSwizzled.h in Headers */,
FF62F64327446DC800AD6EDC /* RewriteSampleMaskVariable.h in Headers */,
31CDFF7D2491849800486F27 /* RewriteStructSamplers.h in Headers */,
Expand Down Expand Up @@ -4124,6 +4131,7 @@
DF83E2762639FD33000825EF /* RemoveUnreferencedVariables.cpp in Sources */,
DF83E31F2639FE17000825EF /* Renderbuffer.cpp in Sources */,
DF83E36E2639FE92000825EF /* RenderbufferGL.cpp in Sources */,
3A084D482B8C317B00374F23 /* SeparateStructFromFunctionDeclarations.cpp in Sources */,
7B76083B289832BD000012A1 /* RenderbufferImpl.cpp in Sources */,
DF83E3852639FEB8000825EF /* RenderBufferMtl.mm in Sources */,
DF83E39C2639FED4000825EF /* renderer_utils.cpp in Sources */,
Expand Down
26 changes: 10 additions & 16 deletions Source/ThirdParty/ANGLE/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ if (angle_build_all) {
"$angle_root/src/tests:angle_tests",
]
if (angle_enable_cl) {
deps += [
"$angle_clspv_dir:clspv",
"$angle_root/src/libOpenCL:angle_cl",
]
deps += [ "$angle_root/src/libOpenCL:angle_cl" ]
}
if (angle_enable_cl && angle_enable_vulkan) {
# OpenCL through Vulkan in ANGLE requires clspv for online compiler
deps += [ "$angle_clspv_dir:clspv" ]
}
if (angle_build_mesa) {
deps += [ "$angle_root/third_party/mesa" ]
Expand Down Expand Up @@ -1356,24 +1357,17 @@ config("shared_library_public_config") {
}
}

# TODO(crbug.com/324916799): Remove once .cr is no more.
if (is_android) {
_cr_suffix = string_replace(shlib_extension, ".so", "")
} else {
_cr_suffix = ""
}

if (angle_expose_wgl_entry_points) {
_angle_glesv2_library_name = "opengl32${angle_libs_suffix}${_cr_suffix}"
_angle_glesv2_library_name = "opengl32${angle_libs_suffix}"
} else {
_angle_glesv2_library_name = "libGLESv2${angle_libs_suffix}${_cr_suffix}"
_angle_glesv2_library_name = "libGLESv2${angle_libs_suffix}"
}
_angle_glesv2_vulkan_secondaries_library_name =
"libGLESv2_vulkan_secondaries${angle_libs_suffix}${_cr_suffix}"
"libGLESv2_vulkan_secondaries${angle_libs_suffix}"

config("library_name_config") {
_egllib = "libEGL${angle_libs_suffix}${_cr_suffix}"
_vk2egllib = "libEGL_vulkan_secondaries${angle_libs_suffix}${_cr_suffix}"
_egllib = "libEGL${angle_libs_suffix}"
_vk2egllib = "libEGL_vulkan_secondaries${angle_libs_suffix}"
defines = [
"ANGLE_EGL_LIBRARY_NAME=\"${_egllib}\"",
"ANGLE_GLESV2_LIBRARY_NAME=\"${_angle_glesv2_library_name}\"",
Expand Down
2 changes: 2 additions & 0 deletions Source/ThirdParty/ANGLE/Compiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ set(angle_translator_sources
"src/compiler/translator/tree_ops/RewriteTexelFetchOffset.h"
"src/compiler/translator/tree_ops/SeparateDeclarations.cpp"
"src/compiler/translator/tree_ops/SeparateDeclarations.h"
"src/compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.cpp"
"src/compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.h"
"src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp"
"src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.h"
"src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp"
Expand Down
87 changes: 60 additions & 27 deletions Source/ThirdParty/ANGLE/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ vars = {
'checkout_angle_mesa': False,

# Version of Chromium our Chromium-based DEPS are mirrored from.
'chromium_revision': '29bec8631d2f6e1cd5e5bc33a847b898a938bc85',
'chromium_revision': 'b54ff9b1d5ede0814c68585f6c9f63f6ec11d73e',
# We never want to checkout chromium,
# but need a dummy DEPS entry for the autoroller
'dummy_checkout_chromium': False,

# Current revision of VK-GL-CTS (a.k.a dEQP).
'vk_gl_cts_revision': 'b9ec0d4bdf99fa61bf53ac6a847a8929c762a1dc',
'vk_gl_cts_revision': 'd15e5faec700518750114f7ebd5440e13090d5f6',

# Current revision of googletest.
# Note: this dep cannot be auto-rolled b/c of nesting.
Expand Down Expand Up @@ -88,11 +88,11 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
'catapult_revision': '51589f432d529593f369075e9b33a390eb1ae948',
'catapult_revision': '189b13f92ef8ce7f9b40ba1ac992482c7df7fcf6',

# the commit queue can handle CLs rolling Fuchsia sdk
# and whatever else without interference from each other.
'fuchsia_version': 'version:18.20240207.3.1',
'fuchsia_version': 'version:18.20240215.1.1',

# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling luci-go
Expand Down Expand Up @@ -130,10 +130,10 @@ vars = {
# reclient CIPD package
'reclient_package': 'infra/rbe/client/',
# reclient CIPD package version
'reclient_version': 're_client_version:0.131.1.784ddbb-gomaip',
'reclient_version': 're_client_version:0.132.0.1a8ff94-gomaip',

# siso CIPD package version.
'siso_version': 'git_revision:3cd0e6e55246b8eca6646e33b124e54e67fc5660',
'siso_version': 'git_revision:b52a6552a2e17e34b747fd5d29875fc4aba99da8',

# 'magic' text to tell depot_tools that git submodules should be accepted but
# but parity with DEPS file is expected.
Expand Down Expand Up @@ -410,12 +410,12 @@ vars = {
deps = {

'build': {
'url': Var('chromium_git') + '/chromium/src/build.git@2cece96e171c60fe129a2bc947f50e2e73aee212',
'url': Var('chromium_git') + '/chromium/src/build.git@e36f984f6f6b87b2740cef9207fcc8f7159a955d',
'condition': 'not build_with_chromium',
},

'buildtools': {
'url': Var('chromium_git') + '/chromium/src/buildtools.git@f35a7d885ace0b7dd8e8ac2376ca759d3905f4dc',
'url': Var('chromium_git') + '/chromium/src/buildtools.git@88acf0de9983614b13d8fcb6a34068b28b753f4c',
'condition': 'not build_with_chromium',
},

Expand All @@ -428,7 +428,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/linux-${{arch}}',
'version': 'git_revision:a2e2717ea670249a34b0de4b3e54f268d320bdfa',
'version': 'git_revision:03d10f1657b4ddace618c34ab61b6357d1ae9c9a',
}
],
'dep_type': 'cipd',
Expand All @@ -439,7 +439,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/mac-${{arch}}',
'version': 'git_revision:a2e2717ea670249a34b0de4b3e54f268d320bdfa',
'version': 'git_revision:03d10f1657b4ddace618c34ab61b6357d1ae9c9a',
}
],
'dep_type': 'cipd',
Expand All @@ -461,25 +461,25 @@ deps = {
'packages': [
{
'package': 'gn/gn/windows-amd64',
'version': 'git_revision:a2e2717ea670249a34b0de4b3e54f268d320bdfa',
'version': 'git_revision:03d10f1657b4ddace618c34ab61b6357d1ae9c9a',
}
],
'dep_type': 'cipd',
'condition': 'not build_with_chromium and host_os == "win"',
},

'testing': {
'url': '{chromium_git}/chromium/src/testing@c37870b5fd70d65f20a42f124e563ab8a0a4d6ac',
'url': '{chromium_git}/chromium/src/testing@87bad53b08ae5292054b8a4e99b27d7c01696c65',
'condition': 'not build_with_chromium',
},

'third_party/abseil-cpp': {
'url': Var('chromium_git') + '/chromium/src/third_party/abseil-cpp@d353dfb09522f2b9575cac3c2d0648282876d8ce',
'url': Var('chromium_git') + '/chromium/src/third_party/abseil-cpp@db06f03d99a04018c19c1e1fd24366bcf5489d62',
'condition': 'not build_with_chromium',
},

'third_party/android_build_tools': {
'url': Var('chromium_git') + '/chromium/src/third_party/android_build_tools@14d1e3676bba509c81ca4836a1b0d93b9e730f04',
'url': Var('chromium_git') + '/chromium/src/third_party/android_build_tools@c55fe19074f411e9c2ca28666a536e9d28487c41',
'condition': 'checkout_android and not build_with_chromium',
},

Expand Down Expand Up @@ -520,7 +520,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_build_tools/lint',
'version': 'Hgob1AcE3OjuqT1wUs6DioB-Vfs96VKmh1vKON4ujigC',
'version': 'H3namO3zonlUj075eXGd_my1zHGpGDoXubhIWd9CG0EC',
},
],
'condition': 'checkout_android and not build_with_chromium',
Expand All @@ -531,15 +531,15 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_build_tools/manifest_merger',
'version': 'DEhOvoBwWVbV8XAI9NG-tn5g27KeMh2pXa44mY4dY10C',
'version': 'tQIUabJkFuwAI7BH20b0nn5fKWSPAa_M8cbkzpIW0VkC',
},
],
'condition': 'checkout_android and not build_with_chromium',
'dep_type': 'cipd',
},

'third_party/android_deps': {
'url': Var('chromium_git') + '/chromium/src/third_party/android_deps@f39e9d8c1aebb53f3d3db520b03aa9902c3268ac',
'url': Var('chromium_git') + '/chromium/src/third_party/android_deps@3cadb173007c0e41218f45f16918c118043ba839',
'condition': 'checkout_android and not build_with_chromium',
},

Expand Down Expand Up @@ -651,7 +651,7 @@ deps = {
},

'third_party/depot_tools': {
'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@a5a09d23fa8ffa03d70f0e3c586b926302fa49d9',
'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@9d64acedead8bf69b1eee2645a18f8fd47a1100d',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -770,7 +770,7 @@ deps = {
},

'third_party/libc++/src': {
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git@9d119c1f4a097b7d27210874f4eba3fc91a83a4e',
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git@1506720cb3d204c8642304717314ff6c7c5e78b7',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -862,7 +862,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'tp4vVuXzmyHJxDFlwxDb7RYZLLEufc3EnGTyOTCTNkgC',
'version': 'ArRcmPYQPKnDIwdwwIr6T8QKNoFb-sQoKac2acxErbsC',
},
],
'condition': 'checkout_android and not build_with_chromium',
Expand Down Expand Up @@ -929,7 +929,7 @@ deps = {
},

'third_party/vulkan-deps': {
'url': Var('chromium_git') + '/vulkan-deps@063ea20a64fc3b1074aa6055d900158ab67529a1',
'url': Var('chromium_git') + '/vulkan-deps@602ab4120d74a3872aa953ac7af5554270549056',
'condition': 'not build_with_chromium',
},

Expand All @@ -944,17 +944,17 @@ deps = {
},

'third_party/zlib': {
'url': Var('chromium_git') + '/chromium/src/third_party/zlib@4b5807f344182fd392849b820642457212618e5f',
'url': Var('chromium_git') + '/chromium/src/third_party/zlib@74a1c5030338acadbbfb32609774a974be89007f',
'condition': 'not build_with_chromium',
},

'tools/android': {
'url': Var('chromium_git') + '/chromium/src/tools/android@84dacdbf12ba8398996fcd9db3c3008d1dda488e',
'url': Var('chromium_git') + '/chromium/src/tools/android@77a2b7ff010e3fec3f3c09de1545f30dd061664f',
'condition': 'checkout_android and not build_with_chromium',
},

'tools/clang': {
'url': Var('chromium_git') + '/chromium/src/tools/clang.git@894ad691c60ed0a74997554f2f54e3b74c367940',
'url': Var('chromium_git') + '/chromium/src/tools/clang.git@acd6cf57ac077a27e3eba00cf724a630bf613b99',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -985,7 +985,7 @@ deps = {
},

'tools/mb': {
'url': Var('chromium_git') + '/chromium/src/tools/mb@68fa723131a742a0e481866074eecce1050f28e3',
'url': Var('chromium_git') + '/chromium/src/tools/mb@3b3f541b36095adc358308683b3374a88f15d272',
'condition': 'not build_with_chromium',
},

Expand All @@ -1000,7 +1000,7 @@ deps = {
},

'tools/perf': {
'url': Var('chromium_git') + '/chromium/src/tools/perf@1972d63ee9bef6aa9a85929de3f804ce9aa0b2e6',
'url': Var('chromium_git') + '/chromium/src/tools/perf@1552db09d2585088bfbe83eb9251b89ef0a35451',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -4029,7 +4029,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base',
'version': 'version:2@18.0.1.cr1',
'version': 'version:2@18.1.0.cr1',
},
],
'condition': 'checkout_android and not build_with_chromium',
Expand Down Expand Up @@ -4190,6 +4190,28 @@ deps = {
'dep_type': 'cipd',
},

'third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl',
'version': 'version:2@16.0.1.cr1',
},
],
'condition': 'checkout_android and not build_with_chromium',
'dep_type': 'cipd',
},

'third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java',
'version': 'version:2@16.0.1.cr1',
},
],
'condition': 'checkout_android and not build_with_chromium',
'dep_type': 'cipd',
},

'third_party/android_deps/libs/com_google_android_gms_play_services_vision': {
'packages': [
{
Expand Down Expand Up @@ -5323,6 +5345,17 @@ deps = {
'dep_type': 'cipd',
},

'third_party/android_deps/libs/org_tensorflow_tensorflow_lite_api': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_tensorflow_tensorflow_lite_api',
'version': 'version:2@2.10.0.cr1',
},
],
'condition': 'checkout_android and not build_with_chromium',
'dep_type': 'cipd',
},

# === ANDROID_DEPS Generated Code End ===
}

Expand Down
1 change: 1 addition & 0 deletions Source/ThirdParty/ANGLE/GL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ if(angle_use_x11)
list(APPEND gl_backend_sources
"src/libANGLE/renderer/gl/glx/DisplayGLX.cpp"
"src/libANGLE/renderer/gl/glx/DisplayGLX.h"
"src/libANGLE/renderer/gl/glx/DisplayGLX_api.h"
"src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp"
"src/libANGLE/renderer/gl/glx/FunctionsGLX.h"
"src/libANGLE/renderer/gl/glx/PbufferSurfaceGLX.cpp"
Expand Down
2 changes: 1 addition & 1 deletion Source/ThirdParty/ANGLE/WebKit/ANGLEShaderProgramVersion.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define ANGLE_PROGRAM_VERSION "77ede981c4d1bd580bd53eac7c2c8071"
#define ANGLE_PROGRAM_VERSION "15dd528a9b681d8ea812941cbb078c31"
#define ANGLE_PROGRAM_VERSION_HASH_SIZE 16
6 changes: 3 additions & 3 deletions Source/ThirdParty/ANGLE/WebKit/angle_commit.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define ANGLE_COMMIT_HASH "40dfb3a8bd65"
#define ANGLE_COMMIT_HASH "acba61cb3e27"
#define ANGLE_COMMIT_HASH_SIZE 12
#define ANGLE_COMMIT_DATE "2024-02-15 12:18:55 +0000"
#define ANGLE_COMMIT_POSITION 22612
#define ANGLE_COMMIT_DATE "2024-02-24 03:25:11 +0000"
#define ANGLE_COMMIT_POSITION 22654
Loading

0 comments on commit a2066e9

Please sign in to comment.