Skip to content

Commit 450d23d

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'upstream/main' into metal-freeze
2 parents 8b9b23f + 8ed1600 commit 450d23d

79 files changed

Lines changed: 2650 additions & 2188 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Apple Inc.
6767
Dean Jackson
6868
Kimmo Kinnunen
6969
Kyle Piddington
70+
Roberto Rodriguez
7071

7172
Autodesk, Inc.
7273
Ranger Harke

‎DEPS‎

Lines changed: 58 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ vars = {
4343
'checkout_angle_mesa': False,
4444

4545
# Version of Chromium our Chromium-based DEPS are mirrored from.
46-
'chromium_revision': '523d69615c9bb972d9afc2d73c42805529d98a18',
46+
'chromium_revision': '76e5315e52d7da531e8c14ba70614381e6420ed5',
4747
# We never want to checkout chromium,
4848
# but need a dummy DEPS entry for the autoroller
4949
'dummy_checkout_chromium': False,
5050

5151
# Current revision of VK-GL-CTS (a.k.a dEQP).
52-
'vk_gl_cts_revision': '7e7a6001a3f424bf6373e9e45bfa4a98e9d9b131',
52+
'vk_gl_cts_revision': 'db48c34bebaf3359453e44ab151a2ff9f9c58eb2',
5353

5454
# Current revision of googletest.
5555
'googletest_revision': '244cec869d12e53378fa0efb610cd4c32a454ec8',
@@ -76,7 +76,7 @@ vars = {
7676
# Three lines of non-changing comments so that
7777
# the commit queue can handle CLs rolling catapult
7878
# and whatever else without interference from each other.
79-
'catapult_revision': '4ca50c8ae1cea0c8f2c87eae90c0fbcb6d7e262b',
79+
'catapult_revision': 'f724a59d02db629831e1b4b3eff407cec902f49b',
8080

8181
# the commit queue can handle CLs rolling Fuchsia sdk
8282
# and whatever else without interference from each other.
@@ -292,6 +292,7 @@ vars = {
292292
'checkout_angle_restricted_trace_hungry_shark_evolution': 'checkout_angle_restricted_traces',
293293
'checkout_angle_restricted_trace_hunter_assassin': 'checkout_angle_restricted_traces',
294294
'checkout_angle_restricted_trace_i9_inferno_nine': 'checkout_angle_restricted_traces',
295+
'checkout_angle_restricted_trace_identity_v': 'checkout_angle_restricted_traces',
295296
'checkout_angle_restricted_trace_idle_heroes': 'checkout_angle_restricted_traces',
296297
'checkout_angle_restricted_trace_indian_bikes_driving_3d': 'checkout_angle_restricted_traces',
297298
'checkout_angle_restricted_trace_infinity_ops': 'checkout_angle_restricted_traces',
@@ -306,6 +307,7 @@ vars = {
306307
'checkout_angle_restricted_trace_kingshot': 'checkout_angle_restricted_traces',
307308
'checkout_angle_restricted_trace_klondike_adventures': 'checkout_angle_restricted_traces',
308309
'checkout_angle_restricted_trace_knives_out': 'checkout_angle_restricted_traces',
310+
'checkout_angle_restricted_trace_lands_of_jail': 'checkout_angle_restricted_traces',
309311
'checkout_angle_restricted_trace_last_shelter_survival': 'checkout_angle_restricted_traces',
310312
'checkout_angle_restricted_trace_last_war_survival_game': 'checkout_angle_restricted_traces',
311313
'checkout_angle_restricted_trace_last_z_survival_shooter': 'checkout_angle_restricted_traces',
@@ -331,6 +333,7 @@ vars = {
331333
'checkout_angle_restricted_trace_marvel_snap': 'checkout_angle_restricted_traces',
332334
'checkout_angle_restricted_trace_marvel_strike_force': 'checkout_angle_restricted_traces',
333335
'checkout_angle_restricted_trace_match_factory': 'checkout_angle_restricted_traces',
336+
'checkout_angle_restricted_trace_match_masters': 'checkout_angle_restricted_traces',
334337
'checkout_angle_restricted_trace_matching_story': 'checkout_angle_restricted_traces',
335338
'checkout_angle_restricted_trace_merge_dragons': 'checkout_angle_restricted_traces',
336339
'checkout_angle_restricted_trace_merge_mansion': 'checkout_angle_restricted_traces',
@@ -513,7 +516,7 @@ vars = {
513516
deps = {
514517

515518
'build': {
516-
'url': Var('chromium_git') + '/chromium/src/build.git@4d06a1da7d3dd500370f0cd5536f0cbfcccfbebb',
519+
'url': Var('chromium_git') + '/chromium/src/build.git@b7a355a6a8b221fe864de9be764df71ed0bf2c1b',
517520
'condition': 'not build_with_chromium',
518521
},
519522

@@ -572,12 +575,12 @@ deps = {
572575
},
573576

574577
'testing': {
575-
'url': '{chromium_git}/chromium/src/testing@6f0cca3144e0a5ad968386e765e52e19df10277d',
578+
'url': '{chromium_git}/chromium/src/testing@2e7f14e4097c99f6b7297215e0fab678e73cc41b',
576579
'condition': 'not build_with_chromium',
577580
},
578581

579582
'third_party/abseil-cpp': {
580-
'url': Var('chromium_git') + '/chromium/src/third_party/abseil-cpp@781b6b2636aba5efc54cc9c141787d4bb82fb175',
583+
'url': Var('chromium_git') + '/chromium/src/third_party/abseil-cpp@8bb24336617f288568351cf383f4f79a542bc74d',
581584
'condition': 'not build_with_chromium',
582585
},
583586

@@ -645,7 +648,7 @@ deps = {
645648
'packages': [
646649
{
647650
'package': 'chromium/third_party/android_build_tools/lint',
648-
'version': '3QcVzxF6pQW8pak81zGzUciRaonUh1NpS3UBjZZfVTsC',
651+
'version': 'VyDrZ5fyFW5p9gU-4TnLHv97fdDn07NGu0uZMhZ5gfsC',
649652
},
650653
],
651654
'condition': 'checkout_android and not build_with_chromium',
@@ -787,7 +790,7 @@ deps = {
787790
},
788791

789792
'third_party/depot_tools': {
790-
'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@eda3b48f2e32304d4ea20fee7ac1d37c9b060b3b',
793+
'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@276ae56a8e9c39f521ed617f0c11c05969d7bb1f',
791794
'condition': 'not build_with_chromium',
792795
},
793796

@@ -915,7 +918,7 @@ deps = {
915918
},
916919

917920
'third_party/llvm-libc/src': {
918-
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git@909b339562be050b89bad069dd25a0893247206d',
921+
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git@b53ec82f9c6f262bae65028e981f9ba35e612642',
919922
'condition': 'not build_with_chromium',
920923
},
921924

@@ -1007,7 +1010,7 @@ deps = {
10071010
'packages': [
10081011
{
10091012
'package': 'chromium/third_party/r8',
1010-
'version': 'SS09E3kPRdP5W064MT-pNrNhXBshbdgO58WU9Y8yY38C',
1013+
'version': '2aBDG942g42qUBPPInGETRHusdxru1U3anwJI_QX5wIC',
10111014
},
10121015
],
10131016
'condition': 'checkout_android and not build_with_chromium',
@@ -1064,15 +1067,15 @@ deps = {
10641067
},
10651068

10661069
'third_party/SwiftShader': {
1067-
'url': Var('swiftshader_git') + '/SwiftShader@18d4f3db94079d05896692b9c6b3d905ec84bce7',
1070+
'url': Var('swiftshader_git') + '/SwiftShader@794b0cfce1d828d187637e6d932bae484fbe0976',
10681071
'condition': 'not build_with_chromium',
10691072
},
10701073

10711074
'third_party/turbine/cipd': {
10721075
'packages': [
10731076
{
10741077
'package': 'chromium/third_party/turbine',
1075-
'version': 'LaDt9HreG5-Q6yBbZLf6LJSvLKqNjamn84VJgZHXSTEC',
1078+
'version': 'UPK1OhajOS06r3w9iwxehBFg7pbTwe9mgMcGkY6-VsEC',
10761079
},
10771080
],
10781081
'condition': 'checkout_android and not build_with_chromium',
@@ -1084,17 +1087,17 @@ deps = {
10841087
},
10851088

10861089
'third_party/vulkan-deps': {
1087-
'url': Var('chromium_git') + '/vulkan-deps@ea4cd2b85ec46b8d139d320177556f0f2fcd1d79',
1090+
'url': Var('chromium_git') + '/vulkan-deps@660b97e7bc4fb848adb6aff51edfe92e5a42cf74',
10881091
'condition': 'not build_with_chromium',
10891092
},
10901093

10911094
'third_party/glslang/src': {
1092-
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@a57276bf558f5cf94d3a9854ebdf5a2236849a5a',
1095+
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@f6652dcf751920b1fbc132619b0e84ef3d6e77c4',
10931096
'condition': 'not build_with_chromium',
10941097
},
10951098

10961099
'third_party/lunarg-vulkantools/src': {
1097-
'url': '{chromium_git}/external/github.com/LunarG/VulkanTools@9830fdc6294421867774291f1285c42ecfae623b',
1100+
'url': '{chromium_git}/external/github.com/LunarG/VulkanTools@6aba93196c86c82e8ebe50920876ae5c028acd9b',
10981101
'condition': 'not build_with_chromium',
10991102
},
11001103

@@ -1104,37 +1107,37 @@ deps = {
11041107
},
11051108

11061109
'third_party/spirv-headers/src': {
1107-
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@01e0577914a75a2569c846778c2f93aa8e6feddd',
1110+
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Headers@9268f3057354a2cb65991ba5f38b16d81e803692',
11081111
'condition': 'not build_with_chromium',
11091112
},
11101113

11111114
'third_party/spirv-tools/src': {
1112-
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@533a69c63ae773d90d03b206954ffffec6517dbd',
1115+
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@b9997dafc791634ce51f6bed7ab886ea0e600a15',
11131116
'condition': 'not build_with_chromium',
11141117
},
11151118

11161119
'third_party/vulkan-headers/src': {
1117-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@a4f8ada9f4f97c45b8c89c57997be9cebaae65d2',
1120+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@33d7f512583b8de44d1b6384aa1cf482f92e53e9',
11181121
'condition': 'not build_with_chromium',
11191122
},
11201123

11211124
'third_party/vulkan-loader/src': {
1122-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@ae0461b671558197a9a50e5fcfcc3b2d3f406b42',
1125+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@385716f0a63fe2c26e54a5140c9877a80da66592',
11231126
'condition': 'not build_with_chromium',
11241127
},
11251128

11261129
'third_party/vulkan-tools/src': {
1127-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@5568ce14705e512113df5b459fc86d857b3d7789',
1130+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@faf69f66f2d9ba782fe37cabd19b9742f9f62eb3',
11281131
'condition': 'not build_with_chromium',
11291132
},
11301133

11311134
'third_party/vulkan-utility-libraries/src': {
1132-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@4d0b838ffcf1ef81151f0e7e11fad1d9ff859813',
1135+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@a1e45945b3a84140956dc4672684090cf8e636a4',
11331136
'condition': 'not build_with_chromium',
11341137
},
11351138

11361139
'third_party/vulkan-validation-layers/src': {
1137-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@2f03cbd1846ba45a27c29172327a989f684a1979',
1140+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@351663e654f0abda9912ee70b2525559e951043a',
11381141
'condition': 'not build_with_chromium',
11391142
},
11401143

@@ -1154,12 +1157,12 @@ deps = {
11541157
},
11551158

11561159
'tools/android': {
1157-
'url': Var('chromium_git') + '/chromium/src/tools/android@66666dece764128e37d5133fffee5373e6a5f4a1',
1160+
'url': Var('chromium_git') + '/chromium/src/tools/android@88ffc02cc77ca4682d42fe500c56b2ee7e103b21',
11581161
'condition': 'checkout_android and not build_with_chromium',
11591162
},
11601163

11611164
'tools/clang': {
1162-
'url': Var('chromium_git') + '/chromium/src/tools/clang.git@1581534567c6cdf96dc916fee3d3d0bb347929bd',
1165+
'url': Var('chromium_git') + '/chromium/src/tools/clang.git@cbc2b48ed7203d21b2e85a37fad3175c8d75d10a',
11631166
'condition': 'not build_with_chromium',
11641167
},
11651168

@@ -1209,7 +1212,7 @@ deps = {
12091212
},
12101213

12111214
'tools/perf': {
1212-
'url': Var('chromium_git') + '/chromium/src/tools/perf@496e9e27a02f91178ff03c6b943fa191def6b269',
1215+
'url': Var('chromium_git') + '/chromium/src/tools/perf@d607462aadb2bc57d12c00970612c00c3202b231',
12131216
'condition': 'not build_with_chromium',
12141217
},
12151218

@@ -2783,6 +2786,16 @@ deps = {
27832786
'dep_type': 'cipd',
27842787
'condition': 'checkout_angle_restricted_trace_i9_inferno_nine',
27852788
},
2789+
'src/tests/restricted_traces/identity_v': {
2790+
'packages': [
2791+
{
2792+
'package': 'angle/traces/identity_v',
2793+
'version': 'version:1',
2794+
},
2795+
],
2796+
'dep_type': 'cipd',
2797+
'condition': 'checkout_angle_restricted_trace_identity_v',
2798+
},
27862799
'src/tests/restricted_traces/idle_heroes': {
27872800
'packages': [
27882801
{
@@ -2923,6 +2936,16 @@ deps = {
29232936
'dep_type': 'cipd',
29242937
'condition': 'checkout_angle_restricted_trace_knives_out',
29252938
},
2939+
'src/tests/restricted_traces/lands_of_jail': {
2940+
'packages': [
2941+
{
2942+
'package': 'angle/traces/lands_of_jail',
2943+
'version': 'version:1',
2944+
},
2945+
],
2946+
'dep_type': 'cipd',
2947+
'condition': 'checkout_angle_restricted_trace_lands_of_jail',
2948+
},
29262949
'src/tests/restricted_traces/last_shelter_survival': {
29272950
'packages': [
29282951
{
@@ -3173,6 +3196,16 @@ deps = {
31733196
'dep_type': 'cipd',
31743197
'condition': 'checkout_angle_restricted_trace_match_factory',
31753198
},
3199+
'src/tests/restricted_traces/match_masters': {
3200+
'packages': [
3201+
{
3202+
'package': 'angle/traces/match_masters',
3203+
'version': 'version:1',
3204+
},
3205+
],
3206+
'dep_type': 'cipd',
3207+
'condition': 'checkout_angle_restricted_trace_match_masters',
3208+
},
31763209
'src/tests/restricted_traces/matching_story': {
31773210
'packages': [
31783211
{

‎build‎

Submodule build updated from 4d06a1d to b7a355a

‎include/GLSLANG/ShaderLang.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
// Version number for shader translation API.
2828
// It is incremented every time the API changes.
29-
#define ANGLE_SH_VERSION 382
29+
#define ANGLE_SH_VERSION 383
3030

3131
enum ShShaderSpec
3232
{
@@ -521,7 +521,6 @@ struct ShBuiltInResources
521521
int EXT_shader_texture_lod;
522522
int EXT_shader_framebuffer_fetch;
523523
int EXT_shader_framebuffer_fetch_non_coherent;
524-
int NV_shader_framebuffer_fetch;
525524
int NV_shader_noperspective_interpolation;
526525
int ARM_shader_framebuffer_fetch;
527526
int ARM_shader_framebuffer_fetch_depth_stencil;

‎infra/specs/angle.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5988,6 +5988,7 @@
59885988
"--test-machine-name",
59895989
"${buildername}",
59905990
"--swiftshader",
5991+
"--key-frame-limit=10",
59915992
"--xvfb",
59925993
"--flaky-retries=2",
59935994
"--git-revision=${got_angle_revision}"
@@ -9628,6 +9629,7 @@
96289629
"--test-machine-name",
96299630
"${buildername}",
96309631
"--swiftshader",
9632+
"--key-frame-limit=10",
96319633
"--git-revision=${got_angle_revision}"
96329634
],
96339635
"merge": {

‎infra/specs/test_suites.pyl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,7 @@
15251525
'--test-machine-name',
15261526
'${buildername}',
15271527
'--swiftshader',
1528+
'--key-frame-limit=10',
15281529
],
15291530
'linux_args': [
15301531
'--xvfb',

‎samples/shader_translator/shader_translator.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ int main(int argc, char *argv[])
244244
case 'g': resources.EXT_frag_depth = 1; break;
245245
case 'l': resources.EXT_shader_texture_lod = 1; break;
246246
case 'f': resources.EXT_shader_framebuffer_fetch = 1; break;
247-
case 'n': resources.NV_shader_framebuffer_fetch = 1; break;
248247
case 'a': resources.ARM_shader_framebuffer_fetch = 1; break;
249248
case 'm':
250249
resources.OVR_multiview2 = 1;
@@ -464,7 +463,6 @@ void usage()
464463
" -x=g : enable EXT_frag_depth\n"
465464
" -x=l : enable EXT_shader_texture_lod\n"
466465
" -x=f : enable EXT_shader_framebuffer_fetch\n"
467-
" -x=n : enable NV_shader_framebuffer_fetch\n"
468466
" -x=a : enable ARM_shader_framebuffer_fetch\n"
469467
" -x=m : enable OVR_multiview\n"
470468
" -x=y : enable YUV_target\n"

‎scripts/code_generation_hashes/ANGLE_shader_translator.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"src/compiler/translator/glslang.l":
77
"9b7c272139d0def4b42e2fd93ae9538d",
88
"src/compiler/translator/glslang.y":
9-
"53e0a7272e498302d2b08726397bddd3",
9+
"e20f49a6ba7bed663de64c0a16a88379",
1010
"src/compiler/translator/glslang_lex_autogen.cpp":
1111
"14c0f0593c173936c5be7f87a05a20b9",
1212
"src/compiler/translator/glslang_tab_autogen.cpp":
13-
"b3a90dde9dea633233d929586571a487",
13+
"2762ed6dcc7abb2a86b951922e73a678",
1414
"src/compiler/translator/glslang_tab_autogen.h":
1515
"028bdaebf359aefbcdaafae466993ebe",
1616
"tools/flex-bison/linux/bison.sha1":

‎scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424
"third_party/VK-GL-CTS/src/external/openglcts/modules/CMakeLists.txt":
2525
"6b87a3cf65a8eb5506a87fa1049e752e",
2626
"third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt":
27-
"7f5919755f5842691b88dc83279fe686",
27+
"397e09a957da589ffd561a4d30bcab6d",
28+
"third_party/VK-GL-CTS/src/external/openglcts/modules/common/meshShader/CMakeLists.txt":
29+
"04532172e252ad28f96de597586cf073",
2830
"third_party/VK-GL-CTS/src/external/openglcts/modules/common/subgroups/CMakeLists.txt":
2931
"bf71ce2d9756ccee7833a789737e6481",
3032
"third_party/VK-GL-CTS/src/external/openglcts/modules/gl/CMakeLists.txt":
31-
"ef2957cb47b715ae02e7a2c83198ea01",
33+
"6ea9e3f13f5f653627d793fd23a9b734",
3234
"third_party/VK-GL-CTS/src/external/openglcts/modules/gles2/CMakeLists.txt":
3335
"5ac63dce60849bf12e3ab2dde99424ab",
3436
"third_party/VK-GL-CTS/src/external/openglcts/modules/gles3/CMakeLists.txt":

‎scripts/code_generation_hashes/SPIR-V_helpers.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
"src/common/spirv/spirv_instruction_parser_autogen.h":
1111
"6fbf8a4b50e2dc8467df9a64c399589e",
1212
"third_party/spirv-headers/src/include/spirv/unified1/spirv.core.grammar.json":
13-
"2c7b20ebd41902a689fb7e97d4830518"
13+
"74dbb578fd9e594e6944e2c91008c6e6"
1414
}

0 commit comments

Comments
 (0)