This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[Impeller] allowing enabling Impeller on macOS. #42639
Merged
auto-submit
merged 5 commits into
flutter:main
from
jonahwilliams:enable_impeller_macos
Jun 12, 2023
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9a2ab40
fix plumbing for impeller context, add FLTEnableImpeller
jonahwilliams caa1f4a
++
jonahwilliams a9e3fa9
++
jonahwilliams 73a2e22
Merge branch 'master' of github.com:flutter/engine into enable_impell…
jonahwilliams 6bcb25c
just use switches.
jonahwilliams File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,6 +62,9 @@ class EmbedderSurfaceMetalImpeller final : public EmbedderSurface, | |
// |GPUSurfaceMetalDelegate| | ||
bool PresentTexture(GPUMTLTextureInfo texture) const override; | ||
|
||
// |EmbedderSurface| | ||
std::shared_ptr<impeller::Context> CreateImpellerContext() const override; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need to override this so we get a context for image decoding. |
||
|
||
FML_DISALLOW_COPY_AND_ASSIGN(EmbedderSurfaceMetalImpeller); | ||
}; | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,6 +49,7 @@ | |
std::make_shared<fml::SyncSwitch>(false), // is_gpu_disabled_sync_switch | ||
"Impeller Library" // library_label | ||
); | ||
FML_LOG(ERROR) << "Using the Impeller rendering backend (Metal)."; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added an error log here to match the other backends |
||
|
||
valid_ = !!context_; | ||
} | ||
|
@@ -75,6 +76,10 @@ | |
return surface; | ||
} | ||
|
||
std::shared_ptr<impeller::Context> EmbedderSurfaceMetalImpeller::CreateImpellerContext() const { | ||
return context_; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (this is fine because it's set up in the ctor) |
||
} | ||
|
||
GPUCAMetalLayerHandle EmbedderSurfaceMetalImpeller::GetCAMetalLayer( | ||
const SkISize& frame_info) const { | ||
FML_CHECK(false) << "Only rendering to MTLTexture is supported."; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved to only using switches