From fd2406035798cf37b12e5801d7e23a96a7a64fc7 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 14 Jul 2023 12:45:53 -0400 Subject: [PATCH] Roll Skia from b4b9c76206f3 to de6099518f90 (4 revisions) (flutter/engine#43687) https://skia.googlesource.com/skia.git/+log/b4b9c76206f3..de6099518f90 2023-07-14 robertphillips@google.com Roll Vulkan Memory Allocator to v3.0.1 2023-07-14 johnstiles@google.com Fix format specifier for backend enum. 2023-07-14 jvanverth@google.com [graphite] Add Vulkan semaphore support. 2023-07-14 kjlubick@google.com Move most of the Ganesh-specific logic out of SkSpecialImage.cpp If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/skia-flutter-autoroll Please CC brianosman@google.com,kjlubick@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Skia: https://bugs.chromium.org/p/skia/issues/entry To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose 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 --- DEPS | 2 +- engine/src/flutter/ci/licenses_golden/licenses_skia | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index efecb0f6707..4be49549205 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { 'llvm_git': 'https://llvm.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': 'b4b9c76206f34ad613f587250895c9f5fc1bd32a', + 'skia_revision': 'de6099518f9082e0fd22f58c9e3c58c7e87d1870', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/engine/src/flutter/ci/licenses_golden/licenses_skia b/engine/src/flutter/ci/licenses_golden/licenses_skia index 20272fcca89..b65ce914751 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_skia +++ b/engine/src/flutter/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 44157e800c284870a4fbc98737cc0102 +Signature: f0f19e777256238738db52d1d9ed9787 ==================================================================================================== LIBRARY: etc1 @@ -6122,6 +6122,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutog ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockCaps.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockTypes.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/utils/SkShaderUtils.cpp + ../../../third_party/skia/LICENSE @@ -6181,6 +6182,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLTypesPriv.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.h FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockCaps.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/mock/GrMockTypes.cpp FILE: ../../../third_party/skia/src/utils/SkShaderUtils.cpp @@ -8283,6 +8285,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/graphite/Sampler.h + ../../../third_pa ORIGIN: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/SpecialImage_Graphite.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/graphite/SpecialImage_Graphite.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/TextureProxyView.h + ../../../third_party/skia/LICENSE @@ -8503,6 +8506,7 @@ FILE: ../../../third_party/skia/src/gpu/graphite/Sampler.h FILE: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.cpp FILE: ../../../third_party/skia/src/gpu/graphite/ShaderCodeDictionary.h FILE: ../../../third_party/skia/src/gpu/graphite/SpecialImage_Graphite.cpp +FILE: ../../../third_party/skia/src/gpu/graphite/SpecialImage_Graphite.h FILE: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.cpp FILE: ../../../third_party/skia/src/gpu/graphite/SynchronizeToCpuTask.h FILE: ../../../third_party/skia/src/gpu/graphite/TextureProxyView.h @@ -8981,6 +8985,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.cpp + ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.h + ../../../third_party/skia/LICENSE @@ -9182,6 +9187,7 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_LazyTexture.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.h +FILE: ../../../third_party/skia/src/gpu/ganesh/image/SkSpecialImage_Ganesh.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/surface/SkSurface_AndroidFactories.cpp FILE: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.cpp FILE: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.h