Skip to content

Commit ff3a2d8

Browse files
authored
Merge branch 'google:main' into master
2 parents 17c54d5 + 1603b2a commit ff3a2d8

33 files changed

Lines changed: 1983 additions & 1269 deletions

File tree

DEPS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,12 +1091,12 @@ deps = {
10911091
},
10921092

10931093
'third_party/vulkan-deps': {
1094-
'url': Var('chromium_git') + '/vulkan-deps@04048f075303f5819381a140a8dadf2a7018100f',
1094+
'url': Var('chromium_git') + '/vulkan-deps@bc269b128e22113fcf71585116eeeeb62d608757',
10951095
'condition': 'not build_with_chromium',
10961096
},
10971097

10981098
'third_party/glslang/src': {
1099-
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@617ecc40dc1d2e64b2796198769ef035d73b9e16',
1099+
'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@b83b2462ae7199c1560c68a710fb373bc2f75f86',
11001100
'condition': 'not build_with_chromium',
11011101
},
11021102

@@ -1116,7 +1116,7 @@ deps = {
11161116
},
11171117

11181118
'third_party/spirv-tools/src': {
1119-
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@cb38b2342beedde25bcff582dc3528a135cf6e67',
1119+
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@a8fa7f5032a528c06339a58d0bd23541085fcfb2',
11201120
'condition': 'not build_with_chromium',
11211121
},
11221122

@@ -1141,7 +1141,7 @@ deps = {
11411141
},
11421142

11431143
'third_party/vulkan-validation-layers/src': {
1144-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@b68b56af414495085f958fdc8d7ee5977ccdbf71',
1144+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@e21ca37295d9615b78b7bed9efa152df9c4e40ad',
11451145
'condition': 'not build_with_chromium',
11461146
},
11471147

infra/config/angle_v2_ci.star

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,30 @@ angle_linux_parent_builder(
8080
# Child Testers #
8181
################################################################################
8282

83+
ci.thin_tester(
84+
name = "angle-linux-x64-nvidia-gtx1660-rel",
85+
description_html = "Tests release ANGLE on Linux/x64 on NVIDIA GTX 1660 GPUs",
86+
parent = "angle-linux-x64-builder-rel",
87+
builder_spec = builder_config.builder_spec(
88+
execution_mode = builder_config.execution_mode.TEST,
89+
gclient_config = builder_config.gclient_config(
90+
config = "angle_v2",
91+
),
92+
chromium_config = builder_config.chromium_config(
93+
config = "angle_v2_clang",
94+
build_config = builder_config.build_config.RELEASE,
95+
target_arch = builder_config.target_arch.INTEL,
96+
target_bits = 64,
97+
target_platform = builder_config.target_platform.LINUX,
98+
),
99+
run_tests_serially = True,
100+
),
101+
console_view_entry = consoles.console_view_entry(
102+
category = "test|linux|x64|rel",
103+
short_name = "1660",
104+
),
105+
)
106+
83107
ci.thin_tester(
84108
name = "angle-linux-x64-sws-rel",
85109
description_html = "Tests release ANGLE on Linux/x64 with SwiftShader",

infra/config/angle_v2_try.star

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ angle_linux_functional_cq_tester(
6161
description_html = "Tests release ANGLE on Linux/x64 on multiple hardware configs. Blocks CL submission.",
6262
mirrors = [
6363
"ci/angle-linux-x64-builder-rel",
64+
"ci/angle-linux-x64-nvidia-gtx1660-rel",
6465
"ci/angle-linux-x64-sws-rel",
6566
],
6667
gn_args = "ci/angle-linux-x64-builder-rel",
@@ -84,6 +85,16 @@ def angle_linux_manual_builder(*, name, **kwargs):
8485

8586
## Functional testers
8687

88+
angle_linux_manual_builder(
89+
name = "angle-try-linux-x64-nvidia-gtx1660-rel",
90+
description_html = "Tests release ANGLE on Linux/x64 on NVIDIA GTX 1660 GPUs. Manual only.",
91+
mirrors = [
92+
"ci/angle-linux-x64-builder-rel",
93+
"ci/angle-linux-x64-nvidia-gtx1660-rel",
94+
],
95+
gn_args = "ci/angle-linux-x64-builder-rel",
96+
)
97+
8798
angle_linux_manual_builder(
8899
name = "angle-try-linux-x64-sws-rel",
89100
description_html = "Tests release ANGLE on Linux/x64 with SwiftShader. Manual only.",

infra/config/generated/builders/gn_args_locations.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"try": {
77
"angle-cq-linux-x64-rel": "try/angle-cq-linux-x64-rel/gn-args.json",
88
"angle-cq-linux-x64-trace": "try/angle-cq-linux-x64-trace/gn-args.json",
9+
"angle-try-linux-x64-nvidia-gtx1660-rel": "try/angle-try-linux-x64-nvidia-gtx1660-rel/gn-args.json",
910
"angle-try-linux-x64-sws-rel": "try/angle-try-linux-x64-sws-rel/gn-args.json"
1011
}
1112
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"gn_args": {
3+
"angle_enable_cl": true,
4+
"angle_with_capture_by_default": true,
5+
"dcheck_always_on": true,
6+
"is_clang": true,
7+
"is_component_build": true,
8+
"is_debug": false,
9+
"symbol_level": 1,
10+
"target_cpu": "x64",
11+
"target_os": "linux",
12+
"use_reclient": false,
13+
"use_remoteexec": true,
14+
"use_siso": true
15+
}
16+
}

infra/config/generated/luci/commit-queue.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ config_groups {
6262
includable_only: true
6363
disable_reuse_footers: "Include-Ci-Only-Tests"
6464
}
65+
builders {
66+
name: "angle/try/angle-try-linux-x64-nvidia-gtx1660-rel"
67+
includable_only: true
68+
disable_reuse_footers: "Include-Ci-Only-Tests"
69+
}
6570
builders {
6671
name: "angle/try/angle-try-linux-x64-sws-rel"
6772
includable_only: true

0 commit comments

Comments
 (0)