зеркало из https://github.com/AvaloniaUI/angle.git
Roll vulkan-deps from c4e128e05c38 to e3fa08b13e32 (12 revisions)
Compare SYNC-HAZARD messages against both '_' and '-' variants during transition, needed after451e8c2848
https://chromium.googlesource.com/vulkan-deps.git/+log/c4e128e05c38..e3fa08b13e32 Changed dependencies: * glslang:69ae9e7460..a53aa3e94f
* spirv-cross:c93ee9261e..210a800130
* spirv-tools:4c456f7da6..5f45f793ae
* vulkan-loader:efe6aa4f3f..fdfdef6d1b
* vulkan-tools:088cfe8047..1ef7bc1547
* vulkan-validation-layers:0a39833305..b50285d33d
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 ianelliott@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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Bug: angleproject:7633 Change-Id: Ib994a8819b7b8bb61f4fa2c70ed838be55ac7e10 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3871554 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Родитель
c2ad74e4e5
Коммит
8454b625ea
2
DEPS
2
DEPS
|
@ -580,7 +580,7 @@ deps = {
|
|||
},
|
||||
|
||||
'third_party/vulkan-deps': {
|
||||
'url': '{chromium_git}/vulkan-deps@c4e128e05c38fb2880c4df0f11cad7f7145faf2c',
|
||||
'url': '{chromium_git}/vulkan-deps@e3fa08b13e32a7778cf2e2aee7523400ee4e2560',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "libANGLE/renderer/vulkan/vk_utils.h"
|
||||
|
||||
#include <EGL/eglext.h>
|
||||
#include <regex>
|
||||
|
||||
#include "common/debug.h"
|
||||
#include "common/platform.h"
|
||||
|
@ -677,7 +678,10 @@ DebugMessageReport ShouldReportDebugMessage(RendererVk *renderer,
|
|||
|
||||
for (const vk::SkippedSyncvalMessage &msg : renderer->getSkippedSyncvalMessages())
|
||||
{
|
||||
if (strstr(messageId, msg.messageId) == nullptr ||
|
||||
std::string dashMessageId(msg.messageId);
|
||||
dashMessageId = std::regex_replace(dashMessageId, std::regex("_"), "-");
|
||||
if ((strstr(messageId, msg.messageId) == nullptr &&
|
||||
strstr(messageId, dashMessageId.c_str()) == nullptr) ||
|
||||
strstr(message, msg.messageContents1) == nullptr ||
|
||||
strstr(message, msg.messageContents2) == nullptr)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче