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

Migrate GL calls of GrBackend* #44334

Merged
kjlubick merged 1 commit into from
Aug 3, 2023
Merged

Migrate GL calls of GrBackend* #44334

kjlubick merged 1 commit into from
Aug 3, 2023

Conversation

@kjlubick
Copy link
Contributor

@kjlubick kjlubick commented Aug 3, 2023

In https://skia-review.googlesource.com/c/skia/+/701398 Skia refactored GrBackend* to not require #ifdefs. This changes
callsites in Flutter to use static functions instead of methods that were conditionally compiled on those classes.

There should be no functional change with these. As I was updating these callsites, I saw uses of the deprecated GrMipMapped enum and used the updated skgpu::Mipmapped (the former is an alias to the latter).

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@kjlubick kjlubick requested a review from jason-simmons August 3, 2023 18:20
@flutter-dashboard
Copy link

flutter-dashboard bot commented Aug 3, 2023

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@kjlubick kjlubick merged commit e3c7a9b into flutter:main Aug 3, 2023
@kjlubick kjlubick deleted the old-gl-calls branch August 3, 2023 19:46
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 3, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 3, 2023
@engine-flutter-autoroll
e3c7a9b8d Migrate GL calls of GrBackend* (flutter/engine#44334)
7a16494
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Aug 3, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Aug 3, 2023
@engine-flutter-autoroll
e3c7a9b8d Migrate GL calls of GrBackend* (flutter/engine#44334)
9aff075
eyebrowsoffire pushed a commit to flutter/flutter that referenced this pull request Aug 3, 2023
@engine-flutter-autoroll @zanderso
Roll Flutter Engine from b08e1410a06a to 0c1de9b8afba (9 revisions) (#…
fd000dc 
…131897)

flutter/engine@b08e141...0c1de9b

2023-08-03 [email protected] [web] fix clicks on merged semantic nodes
(flutter/engine#43620)
2023-08-03 [email protected] Remove WARNINGs from JNI load path as
we can't suppress them (flutter/engine#44348)
2023-08-03 [email protected] Roll Skia from 872dc53233cf to
bae32428c1c7 (3 revisions) (flutter/engine#44341)
2023-08-03 [email protected] Build iOS unittest target in unopt builds
(flutter/engine#44301)
2023-08-03 [email protected] [darwin] Move common targets to
common/BUILD.gn (flutter/engine#44335)
2023-08-03 [email protected] Roll Skia from 2babe68de295 to
872dc53233cf (2 revisions) (flutter/engine#44339)
2023-08-03 [email protected] Migrate GL calls of
GrBackend* (flutter/engine#44334)
2023-08-03 [email protected] Roll Skia from 36072a994f11 to
2babe68de295 (1 revision) (flutter/engine#44336)
2023-08-03 [email protected] Roll Clang from 07c592048780
to 020d2fb7711d (flutter/engine#44332)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] 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

---------

Co-authored-by: Zachary Anderson <[email protected]>
@kjlubick kjlubick mentioned this pull request Aug 14, 2023
Merged
8 tasks
kjlubick added a commit that referenced this pull request Aug 14, 2023
@kjlubick
Migrate more GL calls of GrBackend* (#44682)
eced188 
Follow-up to #44334

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making or feature I am
adding, or Hixie said the PR is test-exempt. See [testing the engine]
for instructions on writing and running engine tests.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/flutter/wiki/Testing-the-engine
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
gaaclarke pushed a commit to gaaclarke/engine that referenced this pull request Aug 30, 2023
@kjlubick @gaaclarke
Migrate GL calls of GrBackend* (flutter#44334)
f715f11 
In https://skia-review.googlesource.com/c/skia/+/701398 Skia refactored
GrBackend* to not require #ifdefs. This changes
callsites in Flutter to use static functions instead of methods that
were conditionally compiled on those classes.

There should be no functional change with these. As I was updating these
callsites, I saw uses of the deprecated GrMipMapped enum and used the
updated skgpu::Mipmapped (the former is an alias to the latter).

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [ ] I added new tests to check the change I am making or feature I am
adding, or Hixie said the PR is test-exempt. See [testing the engine]
for instructions on writing and running engine tests.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/flutter/wiki/Testing-the-engine
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
gaaclarke pushed a commit to gaaclarke/engine that referenced this pull request Aug 30, 2023
@kjlubick @gaaclarke
Migrate more GL calls of GrBackend* (flutter#44682)
f3c5ee2 
Follow-up to flutter#44334

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [ ] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making or feature I am
adding, or Hixie said the PR is test-exempt. See [testing the engine]
for instructions on writing and running engine tests.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/flutter/wiki/Testing-the-engine
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
HinTak added a commit to HinTak/skia-m1xx-python that referenced this pull request Oct 6, 2023
@HinTak
m118: Remove bridge code for legacy GL GrBackendSurface code
297cf6d 
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]>
HinTak added a commit to HinTak/skia-m1xx-python that referenced this pull request Oct 6, 2023
@HinTak
m118: Remove bridge code for legacy GL GrBackendSurface code
d410cc4 
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]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@jason-simmons jason-simmons jason-simmons approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

platform-android

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kjlubick @jason-simmons