From 987205f19e412fd4b0fcae109dfb01d0a36af0c8 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Fri, 4 Aug 2023 15:12:21 +0000 Subject: [PATCH] Roll Skia from 03874e298589 to c40343629a6b (4 revisions) https://skia.googlesource.com/skia.git/+log/03874e298589..c40343629a6b 2023-08-04 kjlubick@google.com Move GrAHardwareBufferUtils to include/android and split GL/VK parts 2023-08-04 brianosman@google.com Remove unnecessary (misleading) SkUtils_opts.h include 2023-08-04 brianosman@google.com Revert "Reland "Roll vulkanmemoryallocator to latest"" 2023-08-04 johnstiles@google.com Eliminate DSLStatement. 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 | 16 +++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index 004ee635b33fc..45a312e74f19c 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': '03874e298589ac1f7ad9571beb7d781cacb29ab3', + 'skia_revision': 'c40343629a6b9797aaa05351ae0ba141014ceb88', # 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 2f977feca6b7d..5bf200ff441c8 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -2837,7 +2837,6 @@ ../../../third_party/skia/src/sksl/README.md ../../../third_party/skia/src/sksl/analysis/BUILD.bazel ../../../third_party/skia/src/sksl/codegen/BUILD.bazel -../../../third_party/skia/src/sksl/dsl/BUILD.bazel ../../../third_party/skia/src/sksl/ir/BUILD.bazel ../../../third_party/skia/src/sksl/lex/BUILD.bazel ../../../third_party/skia/src/sksl/tracing/BUILD.bazel diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 8245aa1a0b642..9c6febec11a84 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 42ab39f12339627bc1fd3cffe34f9261 +Signature: 0d44f910276e7bf67d3216eb4f1ed9e2 ==================================================================================================== LIBRARY: etc1 @@ -5767,6 +5767,7 @@ ORIGIN: ../../../third_party/skia/gm/skbug_8664.cpp + ../../../third_party/skia/ ORIGIN: ../../../third_party/skia/gm/skbug_8955.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/video_decoder.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/gm/yuv420_odd_dim.cpp + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/core/SkTileMode.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/include/gpu/GrRecordingContext.h + ../../../third_party/skia/LICENSE @@ -5829,9 +5830,7 @@ ORIGIN: ../../../third_party/skia/src/core/SkPathMakers.h + ../../../third_party ORIGIN: ../../../third_party/skia/src/core/SkStrikeSpec.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkYUVMath.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/core/SkYUVMath.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrBuffer.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp + ../../../third_party/skia/LICENSE @@ -5911,6 +5910,7 @@ FILE: ../../../third_party/skia/gm/skbug_8664.cpp FILE: ../../../third_party/skia/gm/skbug_8955.cpp FILE: ../../../third_party/skia/gm/video_decoder.cpp FILE: ../../../third_party/skia/gm/yuv420_odd_dim.cpp +FILE: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h FILE: ../../../third_party/skia/include/core/SkTileMode.h FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h FILE: ../../../third_party/skia/include/gpu/GrRecordingContext.h @@ -5973,9 +5973,7 @@ FILE: ../../../third_party/skia/src/core/SkPathMakers.h FILE: ../../../third_party/skia/src/core/SkStrikeSpec.h FILE: ../../../third_party/skia/src/core/SkYUVMath.cpp FILE: ../../../third_party/skia/src/core/SkYUVMath.h -FILE: ../../../third_party/skia/src/gpu/GrAHardwareBufferUtils.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils.cpp -FILE: ../../../third_party/skia/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrBaseContextPriv.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrBuffer.h FILE: ../../../third_party/skia/src/gpu/ganesh/GrContextThreadSafeProxy.cpp @@ -7918,8 +7916,6 @@ ORIGIN: ../../../third_party/skia/src/sksl/SkSLParser.cpp + ../../../third_party ORIGIN: ../../../third_party/skia/src/sksl/SkSLParser.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/SkSLProgramKind.h + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp + ../../../third_party/skia/LICENSE -ORIGIN: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h + ../../../third_party/skia/LICENSE @@ -7953,8 +7949,6 @@ FILE: ../../../third_party/skia/src/sksl/SkSLParser.cpp FILE: ../../../third_party/skia/src/sksl/SkSLParser.h FILE: ../../../third_party/skia/src/sksl/SkSLPosition.h FILE: ../../../third_party/skia/src/sksl/SkSLProgramKind.h -FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.cpp -FILE: ../../../third_party/skia/src/sksl/dsl/DSLStatement.h FILE: ../../../third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLModifierFlags.cpp FILE: ../../../third_party/skia/src/sksl/ir/SkSLPoison.h @@ -8980,6 +8974,7 @@ 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/AHardwareBufferGL.cpp + ../../../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 @@ -8992,6 +8987,7 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/image/SkImage_RasterPinnable.cp 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/ganesh/vk/AHardwareBufferVk.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 ORIGIN: ../../../third_party/skia/src/gpu/graphite/BackendSemaphore.cpp + ../../../third_party/skia/LICENSE @@ -9194,6 +9190,7 @@ 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/AHardwareBufferGL.cpp 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 @@ -9206,6 +9203,7 @@ 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/ganesh/vk/AHardwareBufferVk.cpp FILE: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.cpp FILE: ../../../third_party/skia/src/gpu/graphite/AtlasProvider.h FILE: ../../../third_party/skia/src/gpu/graphite/BackendSemaphore.cpp