From 63dcea65b913ce7881d6f0dd6b7e9e79d28fb3fe Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 22 Jun 2023 16:58:31 +0000 Subject: [PATCH] Roll Skia from 3f3e1da4b7eb to 8168c802c391 (4 revisions) https://skia.googlesource.com/skia.git/+log/3f3e1da4b7eb..8168c802c391 2023-06-22 michaelludwig@google.com [skif] Update lighting image filters to use FilterResult 2023-06-22 jacksongardner@google.com Fix assert logic. 2023-06-22 johnstiles@google.com Eliminate remaining vestiges of SkVM. 2023-06-22 johnstiles@google.com Remove SkVM codegen support from SkSL. 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,fmalita@google.com,jsimmons@google.com,rmistry@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 +- ci/licenses_golden/licenses_skia | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/DEPS b/DEPS index 3c0e5a718b68e..39926b6be56c5 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': '3f3e1da4b7eb47a690e8687334c40e97b479f0e8', + 'skia_revision': '8168c802c3913175a4a17976b50ec5a9b4653d20', # 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/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 60db7092d72d8..7f5ac18ceb0e1 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 59280efac318ee6f9a18277e983429cc +Signature: 1e48a99581883842812b2f63c42aa596 ==================================================================================================== LIBRARY: etc1 @@ -6099,8 +6099,6 @@ ORIGIN: ../../../third_party/skia/src/core/SkImageFilterTypes.h + ../../../third ORIGIN: ../../../third_party/skia/src/core/SkImageFilter_Base.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRuntimeBlender.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRuntimeEffect.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkVM.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkVM.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/AsyncReadTypes.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/Swizzle.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.cpp + ../../../third_party/skia/LICENSE @@ -6160,8 +6158,6 @@ FILE: ../../../third_party/skia/src/core/SkImageFilterTypes.h FILE: ../../../third_party/skia/src/core/SkImageFilter_Base.h FILE: ../../../third_party/skia/src/core/SkRuntimeBlender.cpp FILE: ../../../third_party/skia/src/core/SkRuntimeEffect.cpp -FILE: ../../../third_party/skia/src/core/SkVM.cpp -FILE: ../../../third_party/skia/src/core/SkVM.h FILE: ../../../third_party/skia/src/gpu/AsyncReadTypes.h FILE: ../../../third_party/skia/src/gpu/Swizzle.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrClientMappedBufferManager.cpp @@ -6838,7 +6834,6 @@ ORIGIN: ../../../third_party/skia/src/base/SkBlockAllocator.h + ../../../third_p ORIGIN: ../../../third_party/skia/src/core/SkIDChangeListener.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkMatrixProvider.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkRuntimeEffectPriv.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/core/SkVM_fwd.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkYUVAInfo.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkYUVAPixmaps.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ClipStack.cpp + ../../../third_party/skia/LICENSE @@ -6936,8 +6931,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp + ../../../third_ ORIGIN: ../../../third_party/skia/src/sksl/SkSLThreadContext.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLExpression.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLModifiers.h + ../../../third_party/skia/LICENSE @@ -6980,7 +6973,6 @@ FILE: ../../../third_party/skia/src/base/SkBlockAllocator.h FILE: ../../../third_party/skia/src/core/SkIDChangeListener.cpp FILE: ../../../third_party/skia/src/core/SkMatrixProvider.h FILE: ../../../third_party/skia/src/core/SkRuntimeEffectPriv.h -FILE: ../../../third_party/skia/src/core/SkVM_fwd.h FILE: ../../../third_party/skia/src/core/SkYUVAInfo.cpp FILE: ../../../third_party/skia/src/core/SkYUVAPixmaps.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/ClipStack.cpp @@ -7078,8 +7070,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLSampleUsage.cpp FILE: ../../../third_party/skia/src/sksl/SkSLThreadContext.cpp FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h -FILE: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp -FILE: ../../../third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.cpp FILE: ../../../third_party/skia/src/sksl/dsl/DSLExpression.h FILE: ../../../third_party/skia/src/sksl/dsl/DSLModifiers.h @@ -7144,7 +7134,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.h + ../. ORIGIN: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/opts/SkVM_opts.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLModifiersPool.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.cpp + ../../../third_party/skia/LICENSE @@ -7159,7 +7148,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/ops/StrokeTessellateOp.h FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrStrokeTessellationShader.h FILE: ../../../third_party/skia/src/gpu/ganesh/tessellate/GrTessellationShader.h -FILE: ../../../third_party/skia/src/opts/SkVM_opts.h FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.cpp FILE: ../../../third_party/skia/src/sksl/SkSLModifiersPool.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLConstructor.cpp