Move Vulkan context to EmbedderTestContextVulkan by cbracken · Pull Request #56571 · flutter/engine

cbracken · 2024-11-14T02:25:37Z

In #29391 we extracted EmbedderTestContextVulkan, but didn't move the vulkan_context_ to that class. Since it's no longer used in the base class, we push it down to avoid the ifdef guards.

Issue: flutter/flutter#158998

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.

In #29391 we extracted EmbedderTestContextVulkan, but didn't move the vulkan_context_ to that class. Since it's no longer used in the base class, we push it down to avoid the ifdef guards.

cbracken · 2024-11-14T02:26:04Z

shell/platform/embedder/tests/embedder_test_context.h

-#endif
-
 #ifdef SHELL_ENABLE_GL
  std::shared_ptr<TestEGLContext> egl_context_ = nullptr;


I'll do this in a followup, but we don't yet have a GL subclass.

cbracken · 2024-11-14T02:27:43Z

shell/platform/embedder/tests/embedder_test_context.h


-#ifdef SHELL_ENABLE_VULKAN
-  // The TestVulkanContext destructor must be called _after_ the compositor is
-  // freed.


Hmmm... @bdero is the reason this wasn't pushed down due to the destruction order dependency between this and compositor_? If so, any further details on this?

Context is that I'm doing a larger-scale refactor on the embedder test code to separate things out more cleanly by backend. This was a quick seemingly obvious pre-factoring patch I was thinking I could get out of the way, but if I can't due to an ordering issue that would be great to know so it can be accounted for in the broader refactor.

If it turns out it’s unsafe to move this, it’d be good if we could have a test that tests the underlying condition we’re concerned about since it looks like all tests pass on this patch. Happy to help to do so, once I understand the issue, presuming I’m not just being overly paranoid here.

jonahwilliams

LGTM

If it blends on CI, thatis good enough for me

cbracken · 2024-11-14T17:00:26Z

Yeah I mean this is test code and it passes tests... so... good enough for me too.

@bdero if you can think of a reason this is a super bad idea, please shout and we can find a way to write whatever test we need to write to ensure we don't regress it.

…ine#56571)

Roll Flutter Engine from 619804c to f649330 (47 revisions) flutter/engine@619804c...f649330 2024-11-16 skia-flutter-autoroll@skia.org Roll Skia from 1ef3b910e064 to 6b0f264bde33 (6 revisions) (flutter/engine#56635) 2024-11-16 zanderso@users.noreply.github.com Revert "Remove `android_jit_release_x86`." (flutter/engine#56634) 2024-11-15 chris@bracken.jp Move SetRenderTargetType to EmbedderTestCompositor (flutter/engine#56626) 2024-11-15 skia-flutter-autoroll@skia.org Roll Dart SDK from b62dadb14d82 to eccb15756020 (2 revisions) (flutter/engine#56630) 2024-11-15 andre.stein.1985@gmail.com [TextInput] Add TextInputType.webSearch (#15762) (flutter/engine#56428) 2024-11-15 mdebbar@google.com [web] Send the correct view ID with semantics actions (flutter/engine#56595) 2024-11-15 41930132+hellohuanlin@users.noreply.github.com [macos] early return to suppress clang-tidy warning (flutter/engine#56588) 2024-11-15 chinmaygarde@google.com [Impeller] libImpeller: Tinker on the README to cross reference the SDK and the example. (flutter/engine#56623) 2024-11-15 chaopeng@google.com [fuchsia] MaybeRunInitialVsyncCallback should only called once (flutter/engine#56429) 2024-11-15 magder@google.com Move mac clangd build from x64 to arm (flutter/engine#56567) 2024-11-15 30870216+gaaclarke@users.noreply.github.com Added assert for opengles thread safety (flutter/engine#56585) 2024-11-15 jonahwilliams@google.com [Impeller] enable OpenGL fallback on Android. (flutter/engine#56591) 2024-11-15 jason-simmons@users.noreply.github.com [Impeller] Maintain separate queues of GLES operations for each thread in the reactor (flutter/engine#56573) 2024-11-15 skia-flutter-autoroll@skia.org Roll Dart SDK from abe86ca4eb01 to b62dadb14d82 (2 revisions) (flutter/engine#56615) 2024-11-15 skia-flutter-autoroll@skia.org Roll Skia from b730eb340852 to 1ef3b910e064 (4 revisions) (flutter/engine#56613) 2024-11-15 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from JkpuAsLzcmYLzf1iX... to UpSQzyXGUhMfedYIh... (flutter/engine#56611) 2024-11-15 skia-flutter-autoroll@skia.org Roll Dart SDK from bf0eeb9d929c to abe86ca4eb01 (1 revision) (flutter/engine#56610) 2024-11-15 skia-flutter-autoroll@skia.org Roll Skia from e5fda8472b21 to b730eb340852 (1 revision) (flutter/engine#56608) 2024-11-15 skia-flutter-autoroll@skia.org Roll Skia from 8ff65da4b8bf to e5fda8472b21 (1 revision) (flutter/engine#56603) 2024-11-15 chris@bracken.jp Move TestMetalContext/Surface to testing namespace (flutter/engine#56602) 2024-11-15 skia-flutter-autoroll@skia.org Roll Dart SDK from 343b9fc6eafe to bf0eeb9d929c (1 revision) (flutter/engine#56604) 2024-11-15 chinmaygarde@google.com [Impeller] Don't enable KHR_debug on Angle. (flutter/engine#56601) 2024-11-15 chinmaygarde@google.com [Impeller] libImpeller: Reset the GL state when transitioning control back to the embedder. (flutter/engine#56597) 2024-11-15 skia-flutter-autoroll@skia.org Roll Skia from 8946ea477b42 to 8ff65da4b8bf (2 revisions) (flutter/engine#56600) 2024-11-14 chinmaygarde@google.com [Impeller] Put test components in the testing namespace. (flutter/engine#56594) 2024-11-14 chinmaygarde@google.com [Impeller] libImpeller: Add a warning about OpenGL state being trampled. (flutter/engine#56599) 2024-11-14 chris@bracken.jp Embedder: Refactor EmbedderConfigBuilder by backend (flutter/engine#56598) 2024-11-14 chris@bracken.jp Migrate Metal translation units to Obj-C++ (flutter/engine#56592) 2024-11-14 skia-flutter-autoroll@skia.org Roll Dart SDK from db4d7d52db48 to 343b9fc6eafe (1 revision) (flutter/engine#56590) 2024-11-14 chris@bracken.jp iOS,macOS: Build/test test_metal_surface_unittests (flutter/engine#56586) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from 3222456e63dc to 8946ea477b42 (2 revisions) (flutter/engine#56587) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from 16178bf63de7 to 3222456e63dc (3 revisions) (flutter/engine#56584) 2024-11-14 bruno.leroux@gmail.com [Android] Fix Slider semantics double tap behaviors (flutter/engine#56452) 2024-11-14 skia-flutter-autoroll@skia.org Roll Dart SDK from a3b6652100c8 to db4d7d52db48 (1 revision) (flutter/engine#56581) 2024-11-14 chris@bracken.jp Move Vulkan context to EmbedderTestContextVulkan (flutter/engine#56571) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from a076435073fc to 16178bf63de7 (1 revision) (flutter/engine#56579) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from 70553189e4e8 to a076435073fc (1 revision) (flutter/engine#56577) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from fa52f2c1ddba to 70553189e4e8 (1 revision) (flutter/engine#56576) 2024-11-14 skia-flutter-autoroll@skia.org Roll Dart SDK from 3f05b3540cb2 to a3b6652100c8 (3 revisions) (flutter/engine#56575) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from ddbd8d1cb8d8 to fa52f2c1ddba (3 revisions) (flutter/engine#56574) 2024-11-14 jonahwilliams@google.com [Android] choose 24 bit depth buffer. (flutter/engine#56553) 2024-11-14 skia-flutter-autoroll@skia.org Roll Skia from 3750b8939c7f to ddbd8d1cb8d8 (1 revision) (flutter/engine#56562) 2024-11-14 robert.ancell@canonical.com Move FlMouseCursorHandler from FlView to FlEngine (flutter/engine#56026) 2024-11-14 jonahwilliams@google.com [Impeller] force software resize usage for GLES backend. (flutter/engine#56511) 2024-11-14 skia-flutter-autoroll@skia.org Roll Dart SDK from 66ab1774bfe9 to 3f05b3540cb2 (2 revisions) (flutter/engine#56564) 2024-11-14 chris@bracken.jp Embedder: Refactor EmbedderTestContext creation (flutter/engine#56563) ...

In flutter/engine#29391 we extracted EmbedderTestContextVulkan, but didn't move the vulkan_context_ to that class. Since it's no longer used in the base class, we push it down to avoid the ifdef guards. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

Move Vulkan context to EmbedderTestContextVulkan

da2fd64

In #29391 we extracted EmbedderTestContextVulkan, but didn't move the vulkan_context_ to that class. Since it's no longer used in the base class, we push it down to avoid the ifdef guards.

cbracken requested review from bdero, chinmaygarde and jonahwilliams November 14, 2024 02:25

cbracken commented Nov 14, 2024

View reviewed changes

jonahwilliams approved these changes Nov 14, 2024

View reviewed changes

cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 14, 2024

auto-submit bot merged commit 47f0e15 into flutter:main Nov 14, 2024

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 14, 2024

cbracken deleted the extract-vulkan-context branch November 14, 2024 17:00

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 5f8e6e465584 (36 revisions) flutter/flutter#158992

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

e362ec2

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 8b5560c2f90a (38 revisions) flutter/flutter#158996

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

736e37f

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 0a2034e0061f (39 revisions) flutter/flutter#158999

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

5d19c37

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 3d6486fd6e9b (41 revisions) flutter/flutter#159003

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

8aa6da8

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 134311683b2c (42 revisions) flutter/flutter#159005

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

f6dd6f9

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 7a7df63000a4 (43 revisions) flutter/flutter#159010

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

8f376e8

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 15, 2024

Roll Flutter Engine from 619804c0fbb7 to 58c9d44f5cc8 (44 revisions) flutter/flutter#159012

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 15, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

b006fbd

…ine#56571)

engine-flutter-autoroll mentioned this pull request Nov 16, 2024

Roll Flutter Engine from 619804c0fbb7 to f649330affa8 (47 revisions) flutter/flutter#159015

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 16, 2024

47f0e15 Move Vulkan context to EmbedderTestContextVulkan (flutter/eng…

9de6c3b

…ine#56571)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Vulkan context to EmbedderTestContextVulkan#56571

Move Vulkan context to EmbedderTestContextVulkan#56571
auto-submit[bot] merged 1 commit intoflutter:mainfrom
cbracken:extract-vulkan-context

cbracken commented Nov 14, 2024 •

edited

Loading

Uh oh!

cbracken Nov 14, 2024

Uh oh!

cbracken Nov 14, 2024 •

edited

Loading

Uh oh!

cbracken Nov 14, 2024 •

edited

Loading

Uh oh!

jonahwilliams left a comment

Uh oh!

cbracken commented Nov 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

cbracken commented Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

cbracken Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

cbracken Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cbracken Nov 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jonahwilliams left a comment

Choose a reason for hiding this comment

Uh oh!

cbracken commented Nov 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cbracken commented Nov 14, 2024 •

edited

Loading

cbracken Nov 14, 2024 •

edited

Loading

cbracken Nov 14, 2024 •

edited

Loading