From 5f9f9def781746236c36e457181bf65aaad978ab Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 2 Aug 2023 18:25:34 +0000 Subject: [PATCH] Roll Skia from ccc17f784e5d to 25f5a32367ad (4 revisions) https://skia.googlesource.com/skia.git/+log/ccc17f784e5d..25f5a32367ad 2023-08-02 jlavrova@google.com Justification problems 2023-08-02 johnstiles@google.com Remove DSLType. 2023-08-02 johnstiles@google.com Move verify_type into TypeReference. 2023-08-02 kjlubick@google.com Remove SK_GL #ifdefs from GrBackendSurface 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,jacksongardner@google.com,jvanverth@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/excluded_files | 1 + ci/licenses_golden/licenses_skia | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 184ab57576f2c..50230b69ea01d 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': 'ccc17f784e5d089b1cb24c80efc5c4368a50e64a', + 'skia_revision': '25f5a32367ad4cff037b06b022d101cce61e08ba', # 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/excluded_files b/ci/licenses_golden/excluded_files index 46fec1b3ca9a0..2f977feca6b7d 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2663,6 +2663,7 @@ ../../../third_party/skia/include/gpu/d3d/BUILD.bazel ../../../third_party/skia/include/gpu/dawn/BUILD.bazel ../../../third_party/skia/include/gpu/ganesh/BUILD.bazel +../../../third_party/skia/include/gpu/ganesh/gl/BUILD.bazel ../../../third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel ../../../third_party/skia/include/gpu/gl/BUILD.bazel ../../../third_party/skia/include/gpu/gl/egl/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 79e2505b987f8..c22e34e4c5508 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: e16cd8e9806e6d4ec0a065fbb4deb8ac +Signature: c40b8af304005d033af2e3d50bd2b2e4 ==================================================================================================== LIBRARY: etc1 @@ -390,6 +390,7 @@ FILE: ../../../third_party/skia/relnotes/const_context.md FILE: ../../../third_party/skia/relnotes/mesh_ganesh.md FILE: ../../../third_party/skia/relnotes/runtimeeffect_const.md FILE: ../../../third_party/skia/relnotes/runtimeeffect_image.md +FILE: ../../../third_party/skia/relnotes/skgl_backend_surface.md FILE: ../../../third_party/skia/relnotes/tiledimages.md FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt @@ -6924,8 +6925,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp + ../../. ORIGIN: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.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/DSLType.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLType.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp + ../../../third_party/skia/LICENSE @@ -7062,8 +7061,6 @@ FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp FILE: ../../../third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.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/DSLType.cpp -FILE: ../../../third_party/skia/src/sksl/dsl/DSLType.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifiers.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp @@ -8906,6 +8903,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator. ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkImageGanesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkMeshGanesh.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/graphite/BackendSemaphore.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/graphite/Image.h + ../../../third_party/skia/LICENSE @@ -8970,6 +8968,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/PipelineUtils.h + ../../../third_party ORIGIN: ../../../third_party/skia/src/gpu/TiledTextureUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/TiledTextureUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrBackendSurfacePriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrDeferredDisplayList.cpp + ../../../third_party/skia/LICENSE @@ -8984,6 +8983,8 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurface.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp + ../../../third_party/skia/LICENSE @@ -9116,6 +9117,7 @@ FILE: ../../../third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h FILE: ../../../third_party/skia/include/gpu/ganesh/SkImageGanesh.h FILE: ../../../third_party/skia/include/gpu/ganesh/SkMeshGanesh.h FILE: ../../../third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h +FILE: ../../../third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h FILE: ../../../third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h FILE: ../../../third_party/skia/include/gpu/graphite/BackendSemaphore.h FILE: ../../../third_party/skia/include/gpu/graphite/Image.h @@ -9180,6 +9182,7 @@ FILE: ../../../third_party/skia/src/gpu/PipelineUtils.h FILE: ../../../third_party/skia/src/gpu/TiledTextureUtils.cpp FILE: ../../../third_party/skia/src/gpu/TiledTextureUtils.h FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h +FILE: ../../../third_party/skia/src/gpu/ganesh/GrBackendSurfacePriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/GrCanvas.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrDeferredDisplayList.cpp @@ -9194,6 +9197,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrColorTableEffect.h FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/effects/GrPerlinNoise2Effect.h +FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurface.cpp +FILE: ../../../third_party/skia/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.cpp FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrImageUtils.h FILE: ../../../third_party/skia/src/gpu/ganesh/image/GrTextureGenerator.cpp