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

Reland "Guarding EAGLContext used by Flutter #13314"#13755

Merged
cyanglaz merged 43 commits intoflutter:masterfrom
cyanglaz:gl
Nov 8, 2019
Merged

Reland "Guarding EAGLContext used by Flutter #13314"#13755
cyanglaz merged 43 commits intoflutter:masterfrom
cyanglaz:gl

Conversation

@cyanglaz
Copy link
Contributor

@cyanglaz cyanglaz commented Nov 8, 2019

#13314 failed to pass the tests on simulator.

This PR fix it by ignoring EAGLContext on software rendering.

bool did_submit = true;
for (int64_t view_id : composition_order_) {
EnsureOverlayInitialized(view_id, gl_context, gr_context);
if (gl_context_switch_manager_ != nullptr) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

added a null check here as software surface doesn't have gl

std::shared_ptr<IOSGLContext> gl_context,
GrContext* gr_context) {
FML_DCHECK(flutter_view_);
if (gl_context_switch_manager_ != nullptr) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

added a null check here as software surface doesn't have gl

@iskakaushik
Copy link
Contributor

LGTM

@cyanglaz cyanglaz merged commit 618e666 into flutter:master Nov 8, 2019
@cyanglaz cyanglaz deleted the gl branch November 8, 2019 20:26
@cyanglaz cyanglaz restored the gl branch November 8, 2019 21:04
cyanglaz pushed a commit that referenced this pull request Nov 8, 2019
cyanglaz pushed a commit that referenced this pull request Nov 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 9, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Nov 9, 2019
[email protected]:flutter/engine.git/compare/5f5713e33971...af04338

git log 5f5713e..af04338 --no-merges --oneline
2019-11-08 [email protected] Manual roll of Dart e68ca9b652acdb642668a6acb5f630d5be6c03da...fa4379946109467c8a48f20f19d83d7c72968a3e (flutter/engine#13756)
2019-11-08 [email protected] Revert "Reland "Guarding EAGLContext used by Flutter #13314" (#13755)" (flutter/engine#13757)
2019-11-08 [email protected] [web] Support gif/webp animations, Speed up image drawing in BitmapCanvas.  (flutter/engine#13748)
2019-11-08 [email protected] Reland "Guarding EAGLContext used by Flutter #13314" (flutter/engine#13755)
2019-11-08 [email protected] Move TextRange from the framework to dart:ui. (flutter/engine#13747)
2019-11-08 [email protected] Roll src/third_party/skia 8c1e265f6f81..c88d1774ed50 (7 commits) (flutter/engine#13754)
2019-11-08 [email protected] Revert "Always use `IOSGLContextSwitch` to access EAGLContexts to prevent plugins from polluting Flutter's EAGLContext (#13314)" (flutter/engine#13753)
2019-11-08 [email protected] Always use `IOSGLContextSwitch` to access EAGLContexts to prevent plugins from polluting Flutter's EAGLContext (flutter/engine#13314)


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] on the revert to ensure that a human
is aware of the problem.

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/+/master/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants