Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M119 public #205

Merged
merged 39 commits into from
Nov 1, 2023
Merged

M119 public #205

merged 39 commits into from
Nov 1, 2023

Conversation

HinTak
Copy link
Collaborator

@HinTak HinTak commented Oct 9, 2023

This is inclusive of everything in #204 . Let's see if we can fix a few more of the skips before m120 is out, before merging.

…current m118 (canvaskit/0.38.2-1452-gbd56a010b6)
commit 3e85749702f44e21fdca2285b8c3c6a692e50516
Author: Robert Phillips <[email protected]>
Date:   Tue Aug 8 15:08:28 2023 -0400

    Propagate protected-ness to dependant draws

    For example, when blurring a protected image we need to create protected surfaces and SFCs to accommodate the protectedness.

    Additionally, having an API-level entry point to create a protected SkSurface seems like it would be useful to any client trying to work with protected images or trying to create protected content.

    Change-Id: I191f50ec1e04175c3e243de177ba21e0970f2a58
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/738160
    Reviewed-by: Brian Osman <[email protected]>
    Reviewed-by: Jim Van Verth <[email protected]>
    Commit-Queue: Robert Phillips <[email protected]>
commit d9eb1f0a0c53b6ea4f67a97f58fb8c54367bfbda
Author: Brian Osman <[email protected]>
Date:   Thu Aug 17 19:54:20 2023 +0000

    Remove GrBackendSurfaceMutableState

    Clients are now using skgpu::MutableTextureState directly

    Bug: b/296240795
    Change-Id: Ia310e876d49835ba8046f69372a8db0be30d14ff
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/744256
    Reviewed-by: Greg Daniel <[email protected]>
    Commit-Queue: Brian Osman <[email protected]>
commit ac39b12fd8357fbe88cf8ff29d7ade1773b2cb2b
Author: John Stiles <[email protected]>
Date:   Fri Aug 25 16:23:37 2023 -0400

    Remove GrBackendApi::kDawn.

    Dawn is only supported in Graphite, so we don't need a Ganesh
    backend API enum for it. Our backend-API enums now contain a
    `kUnsupported` enumerant which is returned when calling
    `ContextTypeBackend` with an unsupported context type.

    Bug: b/297077133
    Change-Id: If42280750988f4a1d1f1485eb1fcf065fdb126eb
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/747657
    Reviewed-by: Michael Ludwig <[email protected]>
    Commit-Queue: John Stiles <[email protected]>
    Reviewed-by: Brian Osman <[email protected]>
commit 2cf149beae3fdb70f689ab3b64b138f1fdd5bd0c
Author: Kevin Lubick <[email protected]>
Date:   Mon Aug 14 10:36:08 2023 -0400

    Remove bridge code for legacy GL GrBackendSurface code

    While doing this, I ran into a small #include issue with
    GrGLGpu, so I enforced IWYU on it.

    Client CLs:
     - https://crrev.com/c/4739911
     - http://cl/553620143
     - http://cl/553628593
     - http://cl/553637942
     - http://cl/553705311
     - http://cl/553821763
     - http://cl/553837992
     - http://ag/24343000
     - http://ag/24343454
     - http://ag/24420576
     - http://ag/24445187
     - flutter/engine#44334
     - flutter/engine#44682

    Change-Id: If07cbe3a60593810911c147b8a81e30459623f28
    Bug: b/293490566
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/741437
    Reviewed-by: Greg Daniel <[email protected]>
    Reviewed-by: Brian Osman <[email protected]>
    Commit-Queue: Kevin Lubick <[email protected]>
Without obvious replacements, unlike the others.
Concerning "backend_texture" and "backend_surface_mutable_state" init.
commit c5e67d222f46ede7cdbebf46e1a13f0beea8eecd
Author: Robert Phillips <[email protected]>
Date:   Fri Sep 8 09:18:18 2023 -0400

    Remove deprecated SkImage::makeWithFilter call

    Skia branched for m118 on 9/5/23 so now seems like a good time to delete it. This will give clients one cycle with the call being deprecated before it is removed.

    Bug: b/293326072
    Bug: b/293475819
    Change-Id: I9d4ab17b59a7e9e43365cb45eaa7c32c1d20ea8a
    Reviewed-on: https://skia-review.googlesource.com/c/skia/+/753516
    Reviewed-by: Greg Daniel <[email protected]>
    Commit-Queue: Robert Phillips <[email protected]>
Milestone 119
-------------
  * `SkMergePathEffect`, `SkMatrixPathEffect`, `SkStrokePathEffect`, and
    `SkStrokeAndFillPathEffect` have been removed from the public API.
    These effects can be implemented on the SkPath objects directly using other means and clients
    will likely find performance boosts by doing so.
Milestone 119
-------------
  * `GrDirectContext::submit` and `GrDirectContext::flushAndSubmit` calls now take a GrSyncCpu enum
    instead of a error-prone boolean.

    Similarly, calls to `GrDirectContext::performDeferredCleanup` and
    `GrDirectContext::purgeUnlockedResources` take a GrPurgeResourceOptions enum.
…hAndSubmit takes GrSyncCpu and GrPurgeResourceOptions new enums

GrDirectContext::submit/GrDirectContext::flushAndSubmit now take a GrSyncCpu enum

Milestone 119
-------------
  * `GrDirectContext::submit` and `GrDirectContext::flushAndSubmit` calls now take a GrSyncCpu enum
    instead of a error-prone boolean.

    Similarly, calls to `GrDirectContext::performDeferredCleanup` and
    `GrDirectContext::purgeUnlockedResources` take a GrPurgeResourceOptions enum.
@HinTak
Copy link
Collaborator Author

HinTak commented Oct 10, 2023

@kyamagu #204 added another 19 skips, this 4 more at the moment. So hope to get skip number lowered and passed number higher before another release. However there is probably a good reason for a release if somebody needs/wants a python 3.12 build.

Copy link
Owner

@kyamagu kyamagu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kyamagu
Copy link
Owner

kyamagu commented Oct 11, 2023

@HinTak Thanks! Go ahead to make a beta release

@HinTak HinTak mentioned this pull request Oct 13, 2023
The release notes (below) seems to be mis-information: while the two take identical argument types,
skia.BlendMode.kSrc was valid input for SkImageFilters::Xfermode but does not result in valid
filter for SkImageFilters::Blend. The changed test value to kSrcIn (in another commit) is from
upstream's diff. Other might be acceptable, but kSrc is not. More investigation might be needed for differences
in acceptable inputs.

- Milestone 88
  ------------
    * Add new SkImageFilters::Blend factory function, in place of the now deprecated
    SkImageFilters::Xfermode factory function. Behavior is identical, but name better matches
    conventions in SkShader and SkColorFilter.
    https://review.skia.org/324623
…e that kSrc BlenderMode does not result in valid object.
Emulate withdrawn GL-based GrBackendRenderTarget constructor
with GrBackendRenderTargets::MakeGL factory function.
Emulate withdrawn GL-based GrBackendTexture constructor
with GrBackendTextures::MakeGL factory function.
@HinTak
Copy link
Collaborator Author

HinTak commented Oct 31, 2023

@kyamagu m120 is out today, so I'd like to release this - with one more change: bump it up to 119b4 (since the last one was 117b3). The number of passed tests is marginally lower than 117b3, as a few things were withdrawn/removed upstream, but at least I got #209 fixed so nothing too common / major is broken AFAIC. I'll probably continue with future upstream skia, but would suggest not to merge (e.g. m118) if it is purely disabling more api's.

The #155 related change is more about avoid segfault, not actually fixing the reported problem yet - so that commit message is mis-worded. Sorry about that.

I'll bump it up to 119b4 when the current CI finishes, then merge, then release, unless you say otherwise.

@kyamagu
Copy link
Owner

kyamagu commented Nov 1, 2023

@HinTak Thanks for the hard work! Yes, you can go ahead with the 119b4 release (or, perhaps rename it to 119b1 to reset the minor number).

@HinTak HinTak merged commit a942b21 into kyamagu:main Nov 1, 2023
14 checks passed
@HinTak HinTak deleted the m119-public branch November 1, 2023 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants