Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit cd9e5fc

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll Skia from b17ee34f3378 to 007386294889 (1 revision) (#45075)
https://skia.googlesource.com/skia.git/+log/b17ee34f3378..007386294889 2023-08-24 [email protected] Remove support for Dawn in Ganesh. 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 [email protected],[email protected],[email protected],[email protected] 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
1 parent 965501a commit cd9e5fc

File tree

3 files changed

+3
-62
lines changed

3 files changed

+3
-62
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'b17ee34f337883f45840d16927eb9eb799df8768',
21+
'skia_revision': '007386294889e0b0499c84dd89af34e616248325',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.

‎ci/licenses_golden/excluded_files‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,7 +2666,6 @@
26662666
../../../third_party/skia/include/encode/BUILD.bazel
26672667
../../../third_party/skia/include/gpu/BUILD.bazel
26682668
../../../third_party/skia/include/gpu/d3d/BUILD.bazel
2669-
../../../third_party/skia/include/gpu/dawn/BUILD.bazel
26702669
../../../third_party/skia/include/gpu/ganesh/BUILD.bazel
26712670
../../../third_party/skia/include/gpu/ganesh/gl/BUILD.bazel
26722671
../../../third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel
@@ -2807,7 +2806,6 @@
28072806
../../../third_party/skia/src/gpu/dawn/BUILD.bazel
28082807
../../../third_party/skia/src/gpu/ganesh/BUILD.bazel
28092808
../../../third_party/skia/src/gpu/ganesh/d3d/BUILD.bazel
2810-
../../../third_party/skia/src/gpu/ganesh/dawn/BUILD.bazel
28112809
../../../third_party/skia/src/gpu/ganesh/effects/BUILD.bazel
28122810
../../../third_party/skia/src/gpu/ganesh/geometry/BUILD.bazel
28132811
../../../third_party/skia/src/gpu/ganesh/gl/BUILD.bazel

‎ci/licenses_golden/licenses_skia‎

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 094fbf0c9e66d3e41afea2dc7c2323ca
1+
Signature: 335a306b95bd3fd20b6ee5a14672e7ff
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -387,6 +387,7 @@ FILE: ../../../third_party/skia/modules/skparagraph/test.html
387387
FILE: ../../../third_party/skia/package-lock.json
388388
FILE: ../../../third_party/skia/relnotes/sksl_always_on.md
389389
FILE: ../../../third_party/skia/relnotes/sksl_comma_array.md
390+
FILE: ../../../third_party/skia/relnotes/sksl_ganesh_dawn_removed.md
390391
FILE: ../../../third_party/skia/src/core/SkOrderedReadBuffer.h
391392
FILE: ../../../third_party/skia/src/gpu/gpu_workaround_list.txt
392393
FILE: ../../../third_party/skia/src/sksl/generated/sksl_compute.minified.sksl
@@ -5760,7 +5761,6 @@ ORIGIN: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h + ../
57605761
ORIGIN: ../../../third_party/skia/include/core/SkTileMode.h + ../../../third_party/skia/LICENSE
57615762
ORIGIN: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h + ../../../third_party/skia/LICENSE
57625763
ORIGIN: ../../../third_party/skia/include/gpu/GrRecordingContext.h + ../../../third_party/skia/LICENSE
5763-
ORIGIN: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h + ../../../third_party/skia/LICENSE
57645764
ORIGIN: ../../../third_party/skia/include/ports/SkCFObject.h + ../../../third_party/skia/LICENSE
57655765
ORIGIN: ../../../third_party/skia/include/private/SkSLDefines.h + ../../../third_party/skia/LICENSE
57665766
ORIGIN: ../../../third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h + ../../../third_party/skia/LICENSE
@@ -5838,30 +5838,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp + ../
58385838
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h + ../../../third_party/skia/LICENSE
58395839
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp + ../../../third_party/skia/LICENSE
58405840
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h + ../../../third_party/skia/LICENSE
5841-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.cpp + ../../../third_party/skia/LICENSE
5842-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.h + ../../../third_party/skia/LICENSE
5843-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.cpp + ../../../third_party/skia/LICENSE
5844-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.h + ../../../third_party/skia/LICENSE
5845-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.cpp + ../../../third_party/skia/LICENSE
5846-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.h + ../../../third_party/skia/LICENSE
5847-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.cpp + ../../../third_party/skia/LICENSE
5848-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.h + ../../../third_party/skia/LICENSE
5849-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp + ../../../third_party/skia/LICENSE
5850-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h + ../../../third_party/skia/LICENSE
5851-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp + ../../../third_party/skia/LICENSE
5852-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h + ../../../third_party/skia/LICENSE
5853-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp + ../../../third_party/skia/LICENSE
5854-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h + ../../../third_party/skia/LICENSE
5855-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp + ../../../third_party/skia/LICENSE
5856-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.h + ../../../third_party/skia/LICENSE
5857-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp + ../../../third_party/skia/LICENSE
5858-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.h + ../../../third_party/skia/LICENSE
5859-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.cpp + ../../../third_party/skia/LICENSE
5860-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.h + ../../../third_party/skia/LICENSE
5861-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp + ../../../third_party/skia/LICENSE
5862-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h + ../../../third_party/skia/LICENSE
5863-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.cpp + ../../../third_party/skia/LICENSE
5864-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.h + ../../../third_party/skia/LICENSE
58655841
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h + ../../../third_party/skia/LICENSE
58665842
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm + ../../../third_party/skia/LICENSE
58675843
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h + ../../../third_party/skia/LICENSE
@@ -5903,7 +5879,6 @@ FILE: ../../../third_party/skia/include/android/GrAHardwareBufferUtils.h
59035879
FILE: ../../../third_party/skia/include/core/SkTileMode.h
59045880
FILE: ../../../third_party/skia/include/gpu/GrContextThreadSafeProxy.h
59055881
FILE: ../../../third_party/skia/include/gpu/GrRecordingContext.h
5906-
FILE: ../../../third_party/skia/include/gpu/dawn/GrDawnTypes.h
59075882
FILE: ../../../third_party/skia/include/ports/SkCFObject.h
59085883
FILE: ../../../third_party/skia/include/private/SkSLDefines.h
59095884
FILE: ../../../third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h
@@ -5981,30 +5956,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.cpp
59815956
FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVUniformHandler.h
59825957
FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp
59835958
FILE: ../../../third_party/skia/src/gpu/ganesh/GrSPIRVVaryingHandler.h
5984-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.cpp
5985-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAttachment.h
5986-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.cpp
5987-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnBuffer.h
5988-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.cpp
5989-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnCaps.h
5990-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.cpp
5991-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnGpu.h
5992-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp
5993-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h
5994-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp
5995-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h
5996-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp
5997-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h
5998-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp
5999-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRenderTarget.h
6000-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp
6001-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnRingBuffer.h
6002-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.cpp
6003-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTexture.h
6004-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp
6005-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h
6006-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.cpp
6007-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnUtil.h
60085959
FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h
60095960
FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm
60105961
FILE: ../../../third_party/skia/src/gpu/ganesh/mtl/GrMtlDepthStencil.h
@@ -7433,7 +7384,6 @@ ORIGIN: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h + ../../../
74337384
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h + ../../../third_party/skia/LICENSE
74347385
ORIGIN: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h + ../../../third_party/skia/LICENSE
74357386
ORIGIN: ../../../third_party/skia/include/private/chromium/Slug.h + ../../../third_party/skia/LICENSE
7436-
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h + ../../../third_party/skia/LICENSE
74377387
ORIGIN: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h + ../../../third_party/skia/LICENSE
74387388
ORIGIN: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp + ../../../third_party/skia/LICENSE
74397389
ORIGIN: ../../../third_party/skia/src/base/SkEnumBitMask.h + ../../../third_party/skia/LICENSE
@@ -7467,7 +7417,6 @@ ORIGIN: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h + ../../
74677417
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp + ../../../third_party/skia/LICENSE
74687418
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.h + ../../../third_party/skia/LICENSE
74697419
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp + ../../../third_party/skia/LICENSE
7470-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp + ../../../third_party/skia/LICENSE
74717420
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h + ../../../third_party/skia/LICENSE
74727421
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp + ../../../third_party/skia/LICENSE
74737422
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp + ../../../third_party/skia/LICENSE
@@ -7653,7 +7602,6 @@ FILE: ../../../third_party/skia/include/gpu/graphite/TextureInfo.h
76537602
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlBackendContext.h
76547603
FILE: ../../../third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypes.h
76557604
FILE: ../../../third_party/skia/include/private/chromium/Slug.h
7656-
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrDawnTypesPriv.h
76577605
FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrMockTypesPriv.h
76587606
FILE: ../../../third_party/skia/modules/canvaskit/paragraph_bindings_gen.cpp
76597607
FILE: ../../../third_party/skia/src/base/SkEnumBitMask.h
@@ -7687,7 +7635,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/GrYUVATextureProxies.h
76877635
FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.cpp
76887636
FILE: ../../../third_party/skia/src/gpu/ganesh/SurfaceFillContext.h
76897637
FILE: ../../../third_party/skia/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp
7690-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp
76917638
FILE: ../../../third_party/skia/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h
76927639
FILE: ../../../third_party/skia/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp
76937640
FILE: ../../../third_party/skia/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp
@@ -8631,8 +8578,6 @@ ORIGIN: ../../../third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h +
86318578
ORIGIN: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h + ../../../third_party/skia/LICENSE
86328579
ORIGIN: ../../../third_party/skia/include/private/gpu/vk/VulkanTypesPriv.h + ../../../third_party/skia/LICENSE
86338580
ORIGIN: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h + ../../../third_party/skia/LICENSE
8634-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp + ../../../third_party/skia/LICENSE
8635-
ORIGIN: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h + ../../../third_party/skia/LICENSE
86368581
ORIGIN: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp + ../../../third_party/skia/LICENSE
86378582
ORIGIN: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h + ../../../third_party/skia/LICENSE
86388583
ORIGIN: ../../../third_party/skia/src/sksl/SkSLPosition.cpp + ../../../third_party/skia/LICENSE
@@ -8648,8 +8593,6 @@ FILE: ../../../third_party/skia/include/private/gpu/graphite/DawnTypesPriv.h
86488593
FILE: ../../../third_party/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h
86498594
FILE: ../../../third_party/skia/include/private/gpu/vk/VulkanTypesPriv.h
86508595
FILE: ../../../third_party/skia/src/gpu/MutableTextureStateRef.h
8651-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.cpp
8652-
FILE: ../../../third_party/skia/src/gpu/ganesh/dawn/GrDawnAsyncWait.h
86538596
FILE: ../../../third_party/skia/src/gpu/graphite/vk/VulkanGraphiteTypes.cpp
86548597
FILE: ../../../third_party/skia/src/gpu/tessellate/MidpointContourParser.h
86558598
FILE: ../../../third_party/skia/src/sksl/SkSLPosition.cpp

0 commit comments

Comments
 (0)