Skip to content

Commit 8bf7d45

Browse files
ShabbyXAngle LUCI CQ
authored andcommitted
Manual roll vulkan-deps from 476cafde9e9d to e8b712767b9e (8 revisions)
Manual roll requested by syoussefi@google.com https://chromium.googlesource.com/vulkan-deps.git/+log/476cafde9e9d..e8b712767b9e Also rolling transitive DEPS: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools/+log/321692686b64873ccf4972754e36185697993e21..b9d5ced92ac454caf526c3b80d5105a1f38878ce https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader/+log/35a851d182cdebef408493b9a82ba212d1a2629c..1586f33d6d79eb9ffa5963ce4f70423986b95d8a https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries/+log/2fe3a7791dc9c34a581dc45522ab9b4363b4f321..7b23ba7a5f86936a8d783baf64a77c38977d6890 https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers/+log/a80bafccd11d2b4e44dee21c530da49b41083682..1ce4b30307301d20d58040e088eb57c5ea8bb6ad If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/vulkan-deps-angle-autoroll Please CC angle-team@google.com,geofflang@google.com,syoussefi@google.com on the revert to ensure that a human is aware of the problem. To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Bug: None Change-Id: I297016b55854913ceda6cc4afb80f67eafe65e26 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6183654 Auto-Submit: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Roman Lavrov <romanl@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Roman Lavrov <romanl@google.com>
1 parent 16d8325 commit 8bf7d45

File tree

8 files changed

+25
-10
lines changed

8 files changed

+25
-10
lines changed

DEPS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ deps = {
10171017
},
10181018

10191019
'third_party/vulkan-deps': {
1020-
'url': Var('chromium_git') + '/vulkan-deps@476cafde9e9d1cc28aa35dc3e57468c97e2fa91e',
1020+
'url': Var('chromium_git') + '/vulkan-deps@e8b712767b9e4fe0bef5aebed6f81ea4d4f32a46',
10211021
'condition': 'not build_with_chromium',
10221022
},
10231023

@@ -1042,7 +1042,7 @@ deps = {
10421042
},
10431043

10441044
'third_party/spirv-tools/src': {
1045-
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@321692686b64873ccf4972754e36185697993e21',
1045+
'url': '{chromium_git}/external/github.com/KhronosGroup/SPIRV-Tools@b9d5ced92ac454caf526c3b80d5105a1f38878ce',
10461046
'condition': 'not build_with_chromium',
10471047
},
10481048

@@ -1052,7 +1052,7 @@ deps = {
10521052
},
10531053

10541054
'third_party/vulkan-loader/src': {
1055-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@35a851d182cdebef408493b9a82ba212d1a2629c',
1055+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@1586f33d6d79eb9ffa5963ce4f70423986b95d8a',
10561056
'condition': 'not build_with_chromium',
10571057
},
10581058

@@ -1062,12 +1062,12 @@ deps = {
10621062
},
10631063

10641064
'third_party/vulkan-utility-libraries/src': {
1065-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@2fe3a7791dc9c34a581dc45522ab9b4363b4f321',
1065+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@7b23ba7a5f86936a8d783baf64a77c38977d6890',
10661066
'condition': 'not build_with_chromium',
10671067
},
10681068

10691069
'third_party/vulkan-validation-layers/src': {
1070-
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@a80bafccd11d2b4e44dee21c530da49b41083682',
1070+
'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@1ce4b30307301d20d58040e088eb57c5ea8bb6ad',
10711071
'condition': 'not build_with_chromium',
10721072
},
10731073

src/libANGLE/renderer/vulkan/vk_renderer.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,11 @@ constexpr const char *kSkippedMessagesWithDynamicRendering[] = {
342342
"VUID-vkCmdDrawIndexed-multisampledRenderToSingleSampled-07287",
343343
};
344344

345+
// Mock ICD limitations
346+
constexpr const char *kSkippedMessagesWithMockICD[] = {
347+
"UNASSIGNED-vkAllocateMemory-maxMemoryAllocationSize",
348+
};
349+
345350
// Some syncval errors are resolved in the presence of the NONE load or store render pass ops. For
346351
// those, ANGLE makes no further attempt to resolve them and expects vendor support for the
347352
// extensions instead. The list of skipped messages is split based on this support.
@@ -4226,6 +4231,13 @@ void Renderer::initializeValidationMessageSuppressions()
42264231
kSkippedMessagesWithDynamicRendering + ArraySize(kSkippedMessagesWithDynamicRendering));
42274232
}
42284233

4234+
if (isMockICDEnabled())
4235+
{
4236+
mSkippedValidationMessages.insert(
4237+
mSkippedValidationMessages.end(), kSkippedMessagesWithMockICD,
4238+
kSkippedMessagesWithMockICD + ArraySize(kSkippedMessagesWithMockICD));
4239+
}
4240+
42294241
// Build the list of syncval errors that are currently expected and should be skipped.
42304242
mSkippedSyncvalMessages.insert(mSkippedSyncvalMessages.end(), kSkippedSyncvalMessages,
42314243
kSkippedSyncvalMessages + ArraySize(kSkippedSyncvalMessages));

src/tests/angle_end2end_tests_expectations.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,9 @@ b/330697097 PIXEL6 VULKAN : FramebufferTest_ES31.MultisampleResolveBothAttachmen
940940
// Fails on swangle builders
941941
42266918 SWIFTSHADER : WebGL2GLSLTest.TexelFetchLodOutOfBounds/* = SKIP
942942

943+
// ANGLE should return OOM for large allocations, but doesn't and hits a VVL error
944+
391002353 SWIFTSHADER : TransformFeedbackTest.BufferOutOfMemory/* = SKIP
945+
943946
// HLSL compiler bug
944947
42261155 D3D11 : GLSLTest_ES3.ComplexCrossExpression/* = SKIP
945948

third_party/vulkan-deps

Submodule vulkan-deps updated from 476cafd to e8b7127

0 commit comments

Comments
 (0)