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

[Impeller] implement experimental canvas in snapshot controller. #53750

Merged
auto-submit merged 2 commits into from
Jul 9, 2024
Merged

[Impeller] implement experimental canvas in snapshot controller. #53750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c64062
[Impeller] implement experimental canvas in snapshot controller.
Jul 7, 2024
07607cf
Use gni config.
Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions common/config.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ declare_args() {
# See [go/slimpeller-dashboard](https://github.com/orgs/flutter/projects/21)
# for details.
slimpeller = false

# Opt into new DL dispatcher that skips AIKS layer
experimental_canvas = false
}

# feature_defines_list ---------------------------------------------------------
Expand Down Expand Up @@ -73,6 +76,10 @@ if (slimpeller) {
feature_defines_list += [ "SLIMPELLER=1" ]
}

if (experimental_canvas) {
feature_defines_list += [ "EXPERIMENTAL_CANVAS=1" ]
}

if (is_ios || is_mac) {
flutter_cflags_objc = [
"-Werror=overriding-method-mismatch",
Expand Down
4 changes: 1 addition & 3 deletions impeller/display_list/dl_playground.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#include "third_party/skia/include/core/SkTypeface.h"
#include "txt/platform.h"

#define ENABLE_EXPERIMENTAL_CANVAS false

namespace impeller {

DlPlayground::DlPlayground() = default;
Expand Down Expand Up @@ -50,7 +48,7 @@ bool DlPlayground::OpenPlaygroundHere(DisplayListPlaygroundCallback callback) {

auto list = callback();

#if ENABLE_EXPERIMENTAL_CANVAS
#if EXPERIMENTAL_CANVAS
TextFrameDispatcher collector(context.GetContentContext(), Matrix());
list->Dispatch(collector);

Expand Down
102 changes: 75 additions & 27 deletions shell/common/snapshot_controller_impeller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "flutter/impeller/display_list/dl_image_impeller.h"
#include "flutter/impeller/geometry/size.h"
#include "flutter/shell/common/snapshot_controller.h"
#include "impeller/renderer/render_target.h"

namespace flutter {

Expand All @@ -21,37 +22,84 @@ sk_sp<DlImage> DoMakeRasterSnapshot(
SkISize size,
const std::shared_ptr<impeller::AiksContext>& context) {
TRACE_EVENT0("flutter", __FUNCTION__);
if (!context) {
return nullptr;
}
// Determine render target size.
auto max_size = context->GetContext()
->GetResourceAllocator()
->GetMaxTextureSizeSupported();
double scale_factor_x =
static_cast<double>(max_size.width) / static_cast<double>(size.width());
double scale_factor_y =
static_cast<double>(max_size.height) / static_cast<double>(size.height());
double scale_factor = std::min({1.0, scale_factor_x, scale_factor_y});

auto render_target_size = impeller::ISize(size.width(), size.height());
Copy link
Contributor

@chinmaygarde chinmaygarde Jul 8, 2024

Choose a reason for hiding this comment

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

Nit: TSize has a * operator overload that takes a scalar. So something like size * std::min<Scalar>({1.0, max.width / static_cast<Scalar>(size.width), max.height / static_cast<Scalar>(size.height)) might be more readable.


// Scale down the render target size to the max supported by the
// GPU if necessary. Exceeding the max would otherwise cause a
// null result.
if (scale_factor < 1.0) {
render_target_size.width *= scale_factor;
render_target_size.height *= scale_factor;
}

#if EXPERIMENTAL_CANVAS
// Do not use the render target cache as the lifecycle of this texture
// will outlive a particular frame.
impeller::ISize impeller_size = impeller::ISize(size.width(), size.height());
impeller::RenderTargetAllocator render_target_allocator =
impeller::RenderTargetAllocator(
context->GetContext()->GetResourceAllocator());
impeller::RenderTarget target;
if (context->GetContext()->GetCapabilities()->SupportsOffscreenMSAA()) {
target = render_target_allocator.CreateOffscreenMSAA(
*context->GetContext(), // context
impeller_size, // size
/*mip_count=*/1,
"Picture Snapshot MSAA", // label
impeller::RenderTarget::
Copy link
Contributor

@chinmaygarde chinmaygarde Jul 8, 2024

Choose a reason for hiding this comment

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

Nit: This could perhaps be dried up using a ternary since only the last argument differs based on SupportsOffscreenMSAA and everything else is repeated.

Copy link
Contributor Author

@jonahwilliams jonahwilliams Jul 9, 2024

Choose a reason for hiding this comment

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

Do you mean adding a new CreateOffscreen that differentiates MSAA via an argument?

Copy link
Contributor

@chinmaygarde chinmaygarde Jul 9, 2024

Choose a reason for hiding this comment

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

Nothing as involved as all that. Just context->GetContext()->GetCapabilities()->SupportsOffscreenMSAA() ? kDefaultColorAttachmentConfigMSAA : kDefaultColorAttachmentConfig

Copy link
Contributor Author

@jonahwilliams jonahwilliams Jul 9, 2024

Choose a reason for hiding this comment

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

But the methods are different

Copy link
Contributor

@chinmaygarde chinmaygarde Jul 9, 2024

Choose a reason for hiding this comment

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

derp. Sorry.

kDefaultColorAttachmentConfigMSAA // color_attachment_config
);
} else {
target = render_target_allocator.CreateOffscreen(
*context->GetContext(), // context
impeller_size, // size
/*mip_count=*/1,
"Picture Snapshot", // label
impeller::RenderTarget::
kDefaultColorAttachmentConfig // color_attachment_config
);
}

impeller::TextFrameDispatcher collector(context->GetContentContext(),
impeller::Matrix());
display_list->Dispatch(collector, SkIRect::MakeSize(size));
impeller::ExperimentalDlDispatcher impeller_dispatcher(
context->GetContentContext(), target,
display_list->root_has_backdrop_filter(),
display_list->max_root_blend_mode(),
impeller::IRect::MakeSize(impeller_size));
display_list->Dispatch(impeller_dispatcher, SkIRect::MakeSize(size));
impeller_dispatcher.FinishRecording();

context->GetContentContext().GetLazyGlyphAtlas()->ResetTextFrames();

return impeller::DlImageImpeller::Make(target.GetRenderTargetTexture(),
DlImage::OwningContext::kRaster);
#else
impeller::DlDispatcher dispatcher;
display_list->Dispatch(dispatcher);
impeller::Picture picture = dispatcher.EndRecordingAsPicture();
if (context) {
auto max_size = context->GetContext()
->GetResourceAllocator()
->GetMaxTextureSizeSupported();
double scale_factor_x =
static_cast<double>(max_size.width) / static_cast<double>(size.width());
double scale_factor_y = static_cast<double>(max_size.height) /
static_cast<double>(size.height());
double scale_factor =
std::min(1.0, std::min(scale_factor_x, scale_factor_y));

auto render_target_size = impeller::ISize(size.width(), size.height());

// Scale down the render target size to the max supported by the
// GPU if necessary. Exceeding the max would otherwise cause a
// null result.
if (scale_factor < 1.0) {
render_target_size.width *= scale_factor;
render_target_size.height *= scale_factor;
}

std::shared_ptr<impeller::Image> image =
picture.ToImage(*context, render_target_size);
if (image) {
return impeller::DlImageImpeller::Make(image->GetTexture(),
DlImage::OwningContext::kRaster);
}

std::shared_ptr<impeller::Image> image =
picture.ToImage(*context, render_target_size);
if (image) {
return impeller::DlImageImpeller::Make(image->GetTexture(),
DlImage::OwningContext::kRaster);
}
#endif // EXPERIMENTAL_CANVAS

return nullptr;
}
Expand Down
6 changes: 2 additions & 4 deletions shell/gpu/gpu_surface_metal_impeller.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

static_assert(!__has_feature(objc_arc), "ARC must be disabled.");

#define ENABLE_EXPERIMENTAL_CANVAS false

namespace flutter {

static std::shared_ptr<impeller::Renderer> CreateImpellerRenderer(
Expand Down Expand Up @@ -165,7 +163,7 @@
impeller::IRect cull_rect = surface->coverage();
SkIRect sk_cull_rect = SkIRect::MakeWH(cull_rect.GetWidth(), cull_rect.GetHeight());

#if ENABLE_EXPERIMENTAL_CANVAS
#if EXPERIMENTAL_CANVAS
impeller::TextFrameDispatcher collector(aiks_context->GetContentContext(),
impeller::Matrix());
display_list->Dispatch(collector, sk_cull_rect);
Expand Down Expand Up @@ -285,7 +283,7 @@

impeller::IRect cull_rect = surface->coverage();
SkIRect sk_cull_rect = SkIRect::MakeWH(cull_rect.GetWidth(), cull_rect.GetHeight());
#if ENABLE_EXPERIMENTAL_CANVAS
#if EXPERIMENTAL_CANVAS
impeller::TextFrameDispatcher collector(aiks_context->GetContentContext(),
impeller::Matrix());
display_list->Dispatch(collector, sk_cull_rect);
Expand Down
4 changes: 1 addition & 3 deletions shell/gpu/gpu_surface_vulkan_impeller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

namespace flutter {

#define ENABLE_EXPERIMENTAL_CANVAS false

GPUSurfaceVulkanImpeller::GPUSurfaceVulkanImpeller(
std::shared_ptr<impeller::Context> context) {
if (!context || !context->IsValid()) {
Expand Down Expand Up @@ -89,7 +87,7 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceVulkanImpeller::AcquireFrame(
std::move(surface),
fml::MakeCopyable([&](impeller::RenderTarget& render_target)
-> bool {
#if ENABLE_EXPERIMENTAL_CANVAS
#if EXPERIMENTAL_CANVAS
impeller::TextFrameDispatcher collector(
aiks_context->GetContentContext(), impeller::Matrix());
display_list->Dispatch(
Expand Down