From 5aee7914c7cdc650739b712be1522bf81afc5509 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sat, 14 Jan 2023 19:49:07 -0500 Subject: [PATCH 01/16] Roll Dart SDK from 645fd748e79e to 0097dcbada06 (3 revisions) (#38883) https://dart.googlesource.com/sdk.git/+log/645fd748e79e..0097dcbada06 2023-01-13 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.0.0-125.0.dev 2023-01-13 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.0.0-124.0.dev 2023-01-13 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.0.0-123.0.dev If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/dart-sdk-flutter-engine Please CC aaclarke@google.com,dart-vm-team@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter Engine: 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_third_party | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 6743b400f8823..293d1f9061c0c 100644 --- a/DEPS +++ b/DEPS @@ -48,7 +48,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '645fd748e79ec86e449c1da8ca96540458d08c80', + 'dart_revision': '0097dcbada06953a0831a54b2980ddd5e8d57aef', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 41d17babfea3b..3d441ea28f7d8 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 77f9bd9b1689036bfc5ee73f17f9d033 +Signature: c1ed008dded10874e0defffc05d8246f ==================================================================================================== LIBRARY: angle From 78a68b9dfe11b68df06b06d88ccd4021368325bc Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sat, 14 Jan 2023 23:51:21 -0500 Subject: [PATCH 02/16] Roll Skia from c64a10d525d1 to aa99fa0bdd31 (10 revisions) (#38886) https://skia.googlesource.com/skia.git/+log/c64a10d525d1..aa99fa0bdd31 2023-01-14 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from a56166d59ebd to d52b983a8d10 (5 revisions) 2023-01-14 rmistry@google.com Add dependabot to AUTHORS file 2023-01-14 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SK Tool from 1c46fa8d185d to 3e3b1fec290d 2023-01-14 herb@google.com Change SkAutoTMalloc -> AutoTMalloc and move to skia_private 2023-01-14 johnstiles@google.com Fix IWYU errors on tree. 2023-01-14 lovisolo@google.com [infra] Update Skolo Windows machines to 2022H2. 2023-01-14 johnstiles@google.com Add RP codegen support to skslc. 2023-01-14 johnstiles@google.com Fix RP::Program to work properly when SKSL_STANDALONE is set. 2023-01-13 johnstiles@google.com Migrate SkRasterPipelineOp enum into a separate header. 2023-01-13 johnstiles@google.com Migrate SkRasterPipeline ops into an enum class. 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 aaclarke@google.com,herb@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 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 293d1f9061c0c..f6cac450f8b5d 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': 'c64a10d525d1deadf468e1fa798a11a0dbc3c526', + 'skia_revision': 'aa99fa0bdd31d9bb72ace6c4d973d13891a30a24', # 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 e714e485f97cd..d8881b26e461a 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 5682d715ec30ed409e9cd21d30a89616 +Signature: 8de32506c6d0938eb59c268bc016d4b6 ==================================================================================================== LIBRARY: etc1 @@ -8882,6 +8882,7 @@ ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp + ../../../th ORIGIN: ../../../third_party/skia/src/codec/SkJpegMultiPicture.h + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp + ../../../third_party/skia/LICENSE ORIGIN: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h + ../../../third_party/skia/LICENSE +ORIGIN: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h + ../../../third_party/skia/LICENSE TYPE: LicenseType.bsd FILE: ../../../third_party/skia/include/private/SkGainmapInfo.h FILE: ../../../third_party/skia/src/codec/SkJpegGainmap.cpp @@ -8890,6 +8891,7 @@ FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.cpp FILE: ../../../third_party/skia/src/codec/SkJpegMultiPicture.h FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.cpp FILE: ../../../third_party/skia/src/codec/SkJpegSegmentScan.h +FILE: ../../../third_party/skia/src/core/SkRasterPipelineOpList.h ---------------------------------------------------------------------------------------------------- Copyright 2023 Google Inc. From 398af8c20df21d362201dfc932e69133870e8ecd Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sun, 15 Jan 2023 04:46:22 -0500 Subject: [PATCH 03/16] Roll Fuchsia Mac SDK from w0hr1ZMvYGJnWInwK... to nPbEqgIfE8TLOokQH... (#38889) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/fuchsia-mac-sdk-flutter-engine Please CC aaclarke@google.com on the revert to ensure that a human is aware of the problem. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index f6cac450f8b5d..16a3e216339e2 100644 --- a/DEPS +++ b/DEPS @@ -816,7 +816,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/sdk/core/mac-amd64', - 'version': 'w0hr1ZMvYGJnWInwKSpqPagVaAmctFULO-f2_KITpj8C' + 'version': 'nPbEqgIfE8TLOokQHDs3rQ_PMZ06eW5cKe-FVgzI9EYC' } ], 'condition': 'host_os == "mac" and not download_fuchsia_sdk', From 703502712933b45ef5db4cbabb905c2324a42945 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sun, 15 Jan 2023 07:39:22 -0500 Subject: [PATCH 04/16] Roll Skia from aa99fa0bdd31 to 5a51583d09dd (2 revisions) (#38892) https://skia.googlesource.com/skia.git/+log/aa99fa0bdd31..5a51583d09dd 2023-01-15 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from d52b983a8d10 to a7a1146d9e74 (2 revisions) 2023-01-15 skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com Update SKP version 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 aaclarke@google.com,fmalita@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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 16a3e216339e2..315bfcf0ea73f 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': 'aa99fa0bdd31d9bb72ace6c4d973d13891a30a24', + 'skia_revision': '5a51583d09dd2577676d6a627bb868a0d936f1ca', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. From 2075cf3f86871a249ef2c7cd99d7f86c899802e9 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sun, 15 Jan 2023 17:38:28 -0500 Subject: [PATCH 05/16] Roll Fuchsia Mac SDK from nPbEqgIfE8TLOokQH... to SmEVvAFBC8oriPBou... (#38897) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/fuchsia-mac-sdk-flutter-engine Please CC aaclarke@google.com on the revert to ensure that a human is aware of the problem. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 315bfcf0ea73f..fa39f62308e59 100644 --- a/DEPS +++ b/DEPS @@ -816,7 +816,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/sdk/core/mac-amd64', - 'version': 'nPbEqgIfE8TLOokQHDs3rQ_PMZ06eW5cKe-FVgzI9EYC' + 'version': 'SmEVvAFBC8oriPBouuhggFhFn-ry5ZErj5THhu_-sH4C' } ], 'condition': 'host_os == "mac" and not download_fuchsia_sdk', From ef06ef60213695e797c93550406cc36fc5aba0ac Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Sun, 15 Jan 2023 23:14:13 -0500 Subject: [PATCH 06/16] Roll Skia from 5a51583d09dd to 34a14247bd4b (1 revision) (#38901) https://skia.googlesource.com/skia.git/+log/5a51583d09dd..34a14247bd4b 2023-01-16 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from a7a1146d9e74 to dda150867e4a (1 revision) 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 aaclarke@google.com,fmalita@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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index fa39f62308e59..f675e73643d35 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': '5a51583d09dd2577676d6a627bb868a0d936f1ca', + 'skia_revision': '34a14247bd4b63987c94da9f96359d27d36270d5', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. From 0d374a919a2079ea30652b42048864d34a080e18 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 16 Jan 2023 00:31:23 -0500 Subject: [PATCH 07/16] Roll Skia from 34a14247bd4b to c727016cc09e (1 revision) (#38903) https://skia.googlesource.com/skia.git/+log/34a14247bd4b..c727016cc09e 2023-01-16 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from b8072df2aace to 3785fb7e2771 (13 revisions) 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 aaclarke@google.com,fmalita@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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index f675e73643d35..0fdb06b0089b4 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': '34a14247bd4b63987c94da9f96359d27d36270d5', + 'skia_revision': 'c727016cc09e7fd2fd2450502559860c25e8f894', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. From 31f2020d952a98ef0adce4529edfa7a631ee43bd Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 16 Jan 2023 02:29:23 -0500 Subject: [PATCH 08/16] Roll Skia from c727016cc09e to 214411b09e92 (2 revisions) (#38907) https://skia.googlesource.com/skia.git/+log/c727016cc09e..214411b09e92 2023-01-16 skia-autoroll@skia-public.iam.gserviceaccount.com Roll SwiftShader from 5f9ed9b16931 to aae98adc2222 (1 revision) 2023-01-16 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Skia Infra from d64262f66034 to dc43f9a8e874 (7 revisions) 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 aaclarke@google.com,fmalita@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 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 0fdb06b0089b4..6253d48c9db52 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': 'c727016cc09e7fd2fd2450502559860c25e8f894', + 'skia_revision': '214411b09e928959800bf97cc4821b98f7ded2d9', # 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 d8881b26e461a..582d44e4aa5f1 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 8de32506c6d0938eb59c268bc016d4b6 +Signature: fa5cb2d7013f9608f7c3570a5f475c67 ==================================================================================================== LIBRARY: etc1 From a3006de2732cd699b3e60cf44bae1ebb85dff9ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 08:57:48 +0000 Subject: [PATCH 09/16] Bump actions/setup-python from 4.4.0 to 4.5.0 (#38909) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/5ccb29d8773c3f3f653e1705f474dfaa8a06a912...d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- .github/workflows/third_party_scan.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index fc5608f11e8d9..6335ac588f276 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -19,7 +19,7 @@ jobs: with: persist-credentials: false - name: "setup python" - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 + uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 with: python-version: '3.7.7' # install the python version needed - name: "execute py script" diff --git a/.github/workflows/third_party_scan.yml b/.github/workflows/third_party_scan.yml index 69b8556164fe5..7a37af8687573 100644 --- a/.github/workflows/third_party_scan.yml +++ b/.github/workflows/third_party_scan.yml @@ -27,7 +27,7 @@ jobs: persist-credentials: false - name: setup python - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 + uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 with: python-version: '3.7.7' # install the python version needed From eacc09c47d1b4aa02ac195dd3bef6431e6863ba9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 08:58:41 +0000 Subject: [PATCH 10/16] Bump github/codeql-action from 2.1.37 to 2.1.38 (#38910) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.37 to 2.1.38. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/959cbb7472c4d4ad70cdfe6f4976053fe48ab394...515828d97454b8354517688ddc5b48402b723750) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- .github/workflows/third_party_scan.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6335ac588f276..6c3c817d82c1c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -65,6 +65,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 + uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750 with: sarif_file: results.sarif diff --git a/.github/workflows/third_party_scan.yml b/.github/workflows/third_party_scan.yml index 7a37af8687573..56aef561a8458 100644 --- a/.github/workflows/third_party_scan.yml +++ b/.github/workflows/third_party_scan.yml @@ -51,6 +51,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 + uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750 with: sarif_file: osvReport.sarif From c33c11c9381435bd3e72aea73e682c91256af428 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 16 Jan 2023 03:58:42 -0500 Subject: [PATCH 11/16] Roll Skia from 214411b09e92 to 3704033dd106 (1 revision) (#38908) https://skia.googlesource.com/skia.git/+log/214411b09e92..3704033dd106 2023-01-16 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from f609d294f91c to 8964933f6056 (7 revisions) 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 aaclarke@google.com,fmalita@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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6253d48c9db52..28b01f483947a 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': '214411b09e928959800bf97cc4821b98f7ded2d9', + 'skia_revision': '3704033dd106683c0a2c32178becee105d8cdfc7', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. From afa093dbed1a8b91dd4458d75be0b9d640a0fa64 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Mon, 16 Jan 2023 03:27:16 -0800 Subject: [PATCH 12/16] [Impeller] Map UVs correctly for TiledTextureContents (#38894) --- impeller/aiks/aiks_unittests.cc | 39 ++++++++++++------- .../display_list/display_list_dispatcher.cc | 8 ++-- .../entity/contents/color_source_contents.cc | 2 +- .../entity/contents/color_source_contents.h | 2 +- impeller/entity/contents/scene_contents.cc | 2 +- .../entity/contents/tiled_texture_contents.cc | 13 +++++-- .../entity/contents/tiled_texture_contents.h | 4 +- .../entity/shaders/tiled_texture_fill.vert | 8 ++-- 8 files changed, 48 insertions(+), 30 deletions(-) diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc index 3a501cc532151..c4913e500a1f9 100644 --- a/impeller/aiks/aiks_unittests.cc +++ b/impeller/aiks/aiks_unittests.cc @@ -163,7 +163,7 @@ TEST_P(AiksTest, CanRenderTiledTexture) { contents->SetTexture(texture); contents->SetTileModes(x_tile_mode, y_tile_mode); contents->SetSamplerDescriptor(descriptor); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; paint.color = Color(1, 1, 1, alpha); @@ -347,7 +347,7 @@ TEST_P(AiksTest, CanRenderLinearGradient) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; paint.color = Color(1.0, 1.0, 1.0, alpha); @@ -412,7 +412,7 @@ TEST_P(AiksTest, CanRenderLinearGradientManyColors) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; paint.color = Color(1.0, 1.0, 1.0, alpha); @@ -468,7 +468,7 @@ TEST_P(AiksTest, CanRenderLinearGradientWayManyColors) { contents->SetColors(colors); contents->SetStops(stops); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; canvas.DrawRect({0, 0, 600, 600}, paint); @@ -525,7 +525,7 @@ TEST_P(AiksTest, CanRenderLinearGradientManyColorsUnevenStops) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; canvas.DrawRect({0, 0, 600, 600}, paint); @@ -573,7 +573,7 @@ TEST_P(AiksTest, CanRenderRadialGradient) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; canvas.DrawRect({0, 0, 600, 600}, paint); @@ -635,7 +635,7 @@ TEST_P(AiksTest, CanRenderRadialGradientManyColors) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; canvas.DrawRect({0, 0, 600, 600}, paint); @@ -682,7 +682,7 @@ TEST_P(AiksTest, CanRenderSweepGradient) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; canvas.DrawRect({0, 0, 600, 600}, paint); @@ -744,7 +744,7 @@ TEST_P(AiksTest, CanRenderSweepGradientManyColors) { contents->SetStops(std::move(stops)); contents->SetColors(std::move(colors)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; canvas.DrawRect({0, 0, 600, 600}, paint); @@ -1509,7 +1509,7 @@ TEST_P(AiksTest, GradientStrokesRenderCorrectly) { contents->SetColors(std::move(colors)); contents->SetStops(std::move(stops)); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; @@ -1718,21 +1718,30 @@ TEST_P(AiksTest, SceneColorSource) { auto callback = [&](AiksContext& renderer, RenderTarget& render_target) { Paint paint; + ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize); + static Scalar distance = 2; + ImGui::SliderFloat("Distance", &distance, 0, 4); + static Scalar y_pos = 0; + ImGui::SliderFloat("Y", &y_pos, -3, 3); + static Scalar fov = 45; + ImGui::SliderFloat("FOV", &fov, 1, 180); + ImGui::End(); + paint.color_source_type = Paint::ColorSourceType::kScene; - paint.color_source = [this, gltf_scene]() { + paint.color_source = [&]() { Scalar angle = GetSecondsElapsed(); - Scalar distance = 2; - auto camera_position = - Vector3(distance * std::sin(angle), 2, -distance * std::cos(angle)); + auto camera_position = Vector3(distance * std::sin(angle), y_pos, + -distance * std::cos(angle)); auto contents = std::make_shared(); contents->SetNode(gltf_scene); contents->SetCameraTransform( - Matrix::MakePerspective(Degrees(45), GetWindowSize(), 0.1, 1000) * + Matrix::MakePerspective(Degrees(fov), GetWindowSize(), 0.1, 1000) * Matrix::MakeLookAt(camera_position, {0, 0, 0}, {0, 1, 0})); return contents; }; Canvas canvas; + canvas.DrawPaint(Paint{.color = Color::MakeRGBA8(0xf9, 0xf9, 0xf9, 0xff)}); canvas.Scale(GetContentScale()); canvas.DrawPaint(paint); return renderer.Render(canvas.EndRecordingAsPicture(), render_target); diff --git a/impeller/display_list/display_list_dispatcher.cc b/impeller/display_list/display_list_dispatcher.cc index 0f9b0de500f37..937a987a158a7 100644 --- a/impeller/display_list/display_list_dispatcher.cc +++ b/impeller/display_list/display_list_dispatcher.cc @@ -394,7 +394,7 @@ void DisplayListDispatcher::setColorSource( contents->SetStops(stops); contents->SetEndPoints(start_point, end_point); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; return; @@ -418,7 +418,7 @@ void DisplayListDispatcher::setColorSource( contents->SetStops(stops); contents->SetCenterAndRadius(center, radius); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; return; @@ -445,7 +445,7 @@ void DisplayListDispatcher::setColorSource( contents->SetColors(colors); contents->SetStops(stops); contents->SetTileMode(tile_mode); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; return; @@ -465,7 +465,7 @@ void DisplayListDispatcher::setColorSource( contents->SetTexture(texture); contents->SetTileModes(x_tile_mode, y_tile_mode); contents->SetSamplerDescriptor(desc); - contents->SetMatrix(matrix); + contents->SetEffectTransform(matrix); return contents; }; return; diff --git a/impeller/entity/contents/color_source_contents.cc b/impeller/entity/contents/color_source_contents.cc index c95507ea4fb44..6f0d88d2e8f36 100644 --- a/impeller/entity/contents/color_source_contents.cc +++ b/impeller/entity/contents/color_source_contents.cc @@ -29,7 +29,7 @@ Scalar ColorSourceContents::GetAlpha() const { return alpha_; } -void ColorSourceContents::SetMatrix(Matrix matrix) { +void ColorSourceContents::SetEffectTransform(Matrix matrix) { inverse_matrix_ = matrix.Invert(); } diff --git a/impeller/entity/contents/color_source_contents.h b/impeller/entity/contents/color_source_contents.h index 4396c38395516..89a86cf47ea78 100644 --- a/impeller/entity/contents/color_source_contents.h +++ b/impeller/entity/contents/color_source_contents.h @@ -20,7 +20,7 @@ class ColorSourceContents : public Contents { void SetGeometry(std::shared_ptr geometry); - void SetMatrix(Matrix matrix); + void SetEffectTransform(Matrix matrix); void SetAlpha(Scalar alpha); diff --git a/impeller/entity/contents/scene_contents.cc b/impeller/entity/contents/scene_contents.cc index 3cc574faf2973..ffcb1afa4c18a 100644 --- a/impeller/entity/contents/scene_contents.cc +++ b/impeller/entity/contents/scene_contents.cc @@ -71,7 +71,7 @@ bool SceneContents::Render(const ContentContext& renderer, TiledTextureContents contents; contents.SetGeometry(GetGeometry()); contents.SetTexture(subpass_target.GetRenderTargetTexture()); - contents.SetMatrix( + contents.SetEffectTransform( Matrix::MakeScale(1 / entity.GetTransformation().GetScale())); return contents.Render(renderer, entity, pass); } diff --git a/impeller/entity/contents/tiled_texture_contents.cc b/impeller/entity/contents/tiled_texture_contents.cc index 31f245801bcf8..90f1c15b22fbb 100644 --- a/impeller/entity/contents/tiled_texture_contents.cc +++ b/impeller/entity/contents/tiled_texture_contents.cc @@ -50,14 +50,21 @@ bool TiledTextureContents::Render(const ContentContext& renderer, auto& host_buffer = pass.GetTransientsBuffer(); + auto geometry = GetGeometry(); auto geometry_result = GetGeometry()->GetPositionBuffer(renderer, entity, pass); + // TODO(bdero): The geometry should be fetched from GetPositionUVBuffer and + // contain coverage-mapped UVs, and this should use + // position_uv.vert. + // https://github.com/flutter/flutter/issues/118553 + VS::VertInfo vert_info; vert_info.mvp = geometry_result.transform; - vert_info.matrix = GetInverseMatrix(); - vert_info.texture_size = Vector2{static_cast(texture_size.width), - static_cast(texture_size.height)}; + vert_info.effect_transform = GetInverseMatrix(); + vert_info.bounds_origin = geometry->GetCoverage(Matrix())->origin; + vert_info.texture_size = Vector2(static_cast(texture_size.width), + static_cast(texture_size.height)); FS::FragInfo frag_info; frag_info.texture_sampler_y_coord_scale = texture_->GetYCoordScale(); diff --git a/impeller/entity/contents/tiled_texture_contents.h b/impeller/entity/contents/tiled_texture_contents.h index 95806119c2950..b83ff3e5121e1 100644 --- a/impeller/entity/contents/tiled_texture_contents.h +++ b/impeller/entity/contents/tiled_texture_contents.h @@ -36,8 +36,8 @@ class TiledTextureContents final : public ColorSourceContents { private: std::shared_ptr texture_; SamplerDescriptor sampler_descriptor_ = {}; - Entity::TileMode x_tile_mode_; - Entity::TileMode y_tile_mode_; + Entity::TileMode x_tile_mode_ = Entity::TileMode::kClamp; + Entity::TileMode y_tile_mode_ = Entity::TileMode::kClamp; FML_DISALLOW_COPY_AND_ASSIGN(TiledTextureContents); }; diff --git a/impeller/entity/shaders/tiled_texture_fill.vert b/impeller/entity/shaders/tiled_texture_fill.vert index dabcdf780bf54..1b90e59a62b2c 100644 --- a/impeller/entity/shaders/tiled_texture_fill.vert +++ b/impeller/entity/shaders/tiled_texture_fill.vert @@ -7,7 +7,8 @@ uniform VertInfo { mat4 mvp; - mat4 matrix; + mat4 effect_transform; + vec2 bounds_origin; vec2 texture_size; } vert_info; @@ -18,6 +19,7 @@ out vec2 v_texture_coords; void main() { gl_Position = vert_info.mvp * vec4(position, 0.0, 1.0); - vec2 transformed = IPVec2TransformPosition(vert_info.matrix, position); - v_texture_coords = transformed / vert_info.texture_size; + v_texture_coords = IPVec2TransformPosition( + vert_info.effect_transform, + (position - vert_info.bounds_origin) / vert_info.texture_size); } From 46ea2b3cce1f25a91ed8bc9db150bd0add3d0f2e Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Mon, 16 Jan 2023 06:30:20 -0500 Subject: [PATCH 13/16] Roll Fuchsia Mac SDK from SmEVvAFBC8oriPBou... to bZfX8KCoI3CfxEzsG... (#38912) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/fuchsia-mac-sdk-flutter-engine Please CC aaclarke@google.com on the revert to ensure that a human is aware of the problem. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 28b01f483947a..c8fe4be04b2c5 100644 --- a/DEPS +++ b/DEPS @@ -816,7 +816,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/sdk/core/mac-amd64', - 'version': 'SmEVvAFBC8oriPBouuhggFhFn-ry5ZErj5THhu_-sH4C' + 'version': 'bZfX8KCoI3CfxEzsGGGsncaOX7tmAMboej-gpgZu1iwC' } ], 'condition': 'host_os == "mac" and not download_fuchsia_sdk', From aadb97112b718f11fbfcfdba77fc7ee5d9aee82a Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 17 Jan 2023 03:23:04 -0500 Subject: [PATCH 14/16] Roll Skia from 3704033dd106 to 58e745419425 (4 revisions) (#38936) https://skia.googlesource.com/skia.git/+log/3704033dd106..58e745419425 2023-01-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ANGLE from 8964933f6056 to 734cf7ce212f (4 revisions) 2023-01-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from 3ff606af6dec to 994627019bcb (16 revisions) 2023-01-17 skia-autoroll@skia-public.iam.gserviceaccount.com Roll Dawn from 3785fb7e2771 to cd6104d0f0a1 (4 revisions) 2023-01-16 skia-autoroll@skia-public.iam.gserviceaccount.com Roll vulkan-deps from dda150867e4a to 3ff606af6dec (1 revision) 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 aaclarke@google.com,fmalita@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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c8fe4be04b2c5..2c681e7edd0fd 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': '3704033dd106683c0a2c32178becee105d8cdfc7', + 'skia_revision': '58e745419425420cd70b87adf89e1bde376b72d6', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. From 24b21a5b472a35925b12499e3984edd33e5c455b Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 17 Jan 2023 05:15:23 -0500 Subject: [PATCH 15/16] Roll Fuchsia Mac SDK from bZfX8KCoI3CfxEzsG... to iwCuzAuMgsk75hlT0... (#38938) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/fuchsia-mac-sdk-flutter-engine Please CC aaclarke@google.com on the revert to ensure that a human is aware of the problem. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 2c681e7edd0fd..6a4c695da22ee 100644 --- a/DEPS +++ b/DEPS @@ -816,7 +816,7 @@ deps = { 'packages': [ { 'package': 'fuchsia/sdk/core/mac-amd64', - 'version': 'bZfX8KCoI3CfxEzsGGGsncaOX7tmAMboej-gpgZu1iwC' + 'version': 'iwCuzAuMgsk75hlT0VuqllvQps-iowz5WVsCb6a4mh4C' } ], 'condition': 'host_os == "mac" and not download_fuchsia_sdk', From e65558087ed2947062b43f902637500739d999a6 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Tue, 17 Jan 2023 10:59:34 -0500 Subject: [PATCH 16/16] Roll Skia from 58e745419425 to 6afb97022fa7 (1 revision) (#38943) https://skia.googlesource.com/skia.git/+log/58e745419425..6afb97022fa7 2023-01-17 kjlubick@google.com [cq] Always run IWYU on tests 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 fmalita@google.com,kaushikiska@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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6a4c695da22ee..df5a180a280de 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': '58e745419425420cd70b87adf89e1bde376b72d6', + 'skia_revision': '6afb97022fa754dfd9571b144758d9d717adeef7', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.