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

Started only loading gles3 functions if we have a gles3 context #56636

Merged
merged 3 commits into from
Nov 18, 2024

Conversation

gaaclarke
Copy link
Member

test: exists in #56596
fixes: flutter/flutter#158995

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 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.

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!).

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. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@@ -121,7 +121,16 @@ ProcTableGLES::ProcTableGLES( // NOLINT(google-readability-function-size)
reinterpret_cast<decltype(proc_ivar.function)>(fn_ptr); \
proc_ivar.error_fn = error_fn; \
}
FOR_EACH_IMPELLER_GLES3_PROC(IMPELLER_PROC);

GLint major_version = 0;
Copy link
Member

Choose a reason for hiding this comment

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

Use description_->GetGlVersion().IsAtLeast(...)

Copy link
Member Author

Choose a reason for hiding this comment

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

done

Copy link
Member

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

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

LGTM

@gaaclarke
Copy link
Member Author

I'm going to wait to land this until #56596 does, since it has a good test to make sure this doesn't break anything.

@gaaclarke gaaclarke added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 18, 2024
@auto-submit auto-submit bot merged commit 766370b into flutter:main Nov 18, 2024
31 checks passed
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 18, 2024
@gaaclarke
Copy link
Member Author

I should have rebased before landing, oh well I tested it locally and is almost surely good.

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 18, 2024
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Nov 18, 2024
…159093)

flutter/engine@9686de1...766370b

2024-11-18 30870216+gaaclarke@users.noreply.github.com Started only
loading gles3 functions if we have a gles3 context
(flutter/engine#56636)
2024-11-18 30870216+gaaclarke@users.noreply.github.com [impeller] enable
framebuffer blit when available (flutter/engine#56596)
2024-11-18 skia-flutter-autoroll@skia.org Roll Skia from 7594233ff914 to
0b74d5c3eb4f (4 revisions) (flutter/engine#56678)

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 jimgraham@google.com,zra@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://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 18, 2024
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Nov 18, 2024
…159097)

flutter/engine@9686de1...878f593

2024-11-18 chris@bracken.jp EmbedderTest: Extract backend-specific
user_data (flutter/engine#56642)
2024-11-18 skia-flutter-autoroll@skia.org Roll Dart SDK from
ae5111067032 to 625e0a9cb67a (1 revision) (flutter/engine#56679)
2024-11-18 30870216+gaaclarke@users.noreply.github.com Started only
loading gles3 functions if we have a gles3 context
(flutter/engine#56636)
2024-11-18 30870216+gaaclarke@users.noreply.github.com [impeller] enable
framebuffer blit when available (flutter/engine#56596)
2024-11-18 skia-flutter-autoroll@skia.org Roll Skia from 7594233ff914 to
0b74d5c3eb4f (4 revisions) (flutter/engine#56678)

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 jimgraham@google.com,zra@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://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 18, 2024
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Nov 18, 2024
…159097)

flutter/engine@9686de1...878f593

2024-11-18 chris@bracken.jp EmbedderTest: Extract backend-specific
user_data (flutter/engine#56642)
2024-11-18 skia-flutter-autoroll@skia.org Roll Dart SDK from
ae5111067032 to 625e0a9cb67a (1 revision) (flutter/engine#56679)
2024-11-18 30870216+gaaclarke@users.noreply.github.com Started only
loading gles3 functions if we have a gles3 context
(flutter/engine#56636)
2024-11-18 30870216+gaaclarke@users.noreply.github.com [impeller] enable
framebuffer blit when available (flutter/engine#56596)
2024-11-18 skia-flutter-autoroll@skia.org Roll Skia from 7594233ff914 to
0b74d5c3eb4f (4 revisions) (flutter/engine#56678)

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 jimgraham@google.com,zra@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://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[impeller] don't grab symbols for gles3 symbols with gles2 contexts
2 participants