Skip to content

Commit

Permalink
Remove cull_rects_ from SceneBuilder (flutter#6352)
Browse files Browse the repository at this point in the history 
Skia should already have such optimizations based on a much more
accurate clip stack. As we move to the retained rendering, SceneBuilder
would be much harder to maintain such cull_rects_ stack so let's just
remove them.

No significant performance change is measured locally on Moto G4 with
flutter_gallery transition perf test and complex_layout scroll perf
test.
  • Loading branch information
@liyuqian
liyuqian authored Sep 28, 2018
1 parent 75e404f commit 5550fdb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 56 deletions.
64 changes: 12 additions & 52 deletions lib/ui/compositing/scene_builder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,35 +70,21 @@ void SceneBuilder::RegisterNatives(tonic::DartLibraryNatives* natives) {
FOR_EACH_BINDING(DART_REGISTER_NATIVE)});
}

static const SkRect kGiantRect = SkRect::MakeLTRB(-1E9F, -1E9F, 1E9F, 1E9F);

SceneBuilder::SceneBuilder() {
cull_rects_.push(kGiantRect);
}

SceneBuilder::SceneBuilder() = default;
SceneBuilder::~SceneBuilder() = default;

void SceneBuilder::pushTransform(const tonic::Float64List& matrix4) {
SkMatrix sk_matrix = ToSkMatrix(matrix4);
SkMatrix inverse_sk_matrix;
SkRect cullRect;
// Perspective projections don't produce rectangles that are useful for
// culling for some reason.
if (!sk_matrix.hasPerspective() && sk_matrix.invert(&inverse_sk_matrix)) {
inverse_sk_matrix.mapRect(&cullRect, cull_rects_.top());
} else {
cullRect = kGiantRect;
}
auto layer = std::make_unique<flow::TransformLayer>();
layer->set_transform(sk_matrix);
PushLayer(std::move(layer), cullRect);
PushLayer(std::move(layer));
}

void SceneBuilder::pushOffset(double dx, double dy) {
SkMatrix sk_matrix = SkMatrix::MakeTrans(dx, dy);
auto layer = std::make_unique<flow::TransformLayer>();
layer->set_transform(sk_matrix);
PushLayer(std::move(layer), cull_rects_.top().makeOffset(-dx, -dy));
PushLayer(std::move(layer));
}

void SceneBuilder::pushClipRect(double left,
Expand All @@ -108,55 +94,43 @@ void SceneBuilder::pushClipRect(double left,
int clipBehavior) {
SkRect clipRect = SkRect::MakeLTRB(left, top, right, bottom);
flow::Clip clip_behavior = static_cast<flow::Clip>(clipBehavior);
SkRect cullRect;
if (!cullRect.intersect(clipRect, cull_rects_.top())) {
cullRect = SkRect::MakeEmpty();
}
auto layer = std::make_unique<flow::ClipRectLayer>(clip_behavior);
layer->set_clip_rect(clipRect);
PushLayer(std::move(layer), cullRect);
PushLayer(std::move(layer));
}

void SceneBuilder::pushClipRRect(const RRect& rrect, int clipBehavior) {
flow::Clip clip_behavior = static_cast<flow::Clip>(clipBehavior);
SkRect cullRect;
if (!cullRect.intersect(rrect.sk_rrect.rect(), cull_rects_.top())) {
cullRect = SkRect::MakeEmpty();
}
auto layer = std::make_unique<flow::ClipRRectLayer>(clip_behavior);
layer->set_clip_rrect(rrect.sk_rrect);
PushLayer(std::move(layer), cullRect);
PushLayer(std::move(layer));
}

void SceneBuilder::pushClipPath(const CanvasPath* path, int clipBehavior) {
flow::Clip clip_behavior = static_cast<flow::Clip>(clipBehavior);
FML_DCHECK(clip_behavior != flow::Clip::none);
SkRect cullRect;
if (!cullRect.intersect(path->path().getBounds(), cull_rects_.top())) {
cullRect = SkRect::MakeEmpty();
}
auto layer = std::make_unique<flow::ClipPathLayer>(clip_behavior);
layer->set_clip_path(path->path());
PushLayer(std::move(layer), cullRect);
PushLayer(std::move(layer));
}

void SceneBuilder::pushOpacity(int alpha) {
auto layer = std::make_unique<flow::OpacityLayer>();
layer->set_alpha(alpha);
PushLayer(std::move(layer), cull_rects_.top());
PushLayer(std::move(layer));
}

void SceneBuilder::pushColorFilter(int color, int blendMode) {
auto layer = std::make_unique<flow::ColorFilterLayer>();
layer->set_color(static_cast<SkColor>(color));
layer->set_blend_mode(static_cast<SkBlendMode>(blendMode));
PushLayer(std::move(layer), cull_rects_.top());
PushLayer(std::move(layer));
}

void SceneBuilder::pushBackdropFilter(ImageFilter* filter) {
auto layer = std::make_unique<flow::BackdropFilterLayer>();
layer->set_filter(filter->filter());
PushLayer(std::move(layer), cull_rects_.top());
PushLayer(std::move(layer));
}

void SceneBuilder::pushShaderMask(Shader* shader,
Expand All @@ -171,7 +145,7 @@ void SceneBuilder::pushShaderMask(Shader* shader,
layer->set_shader(shader->shader());
layer->set_mask_rect(rect);
layer->set_blend_mode(static_cast<SkBlendMode>(blendMode));
PushLayer(std::move(layer), cull_rects_.top());
PushLayer(std::move(layer));
}

void SceneBuilder::pushPhysicalShape(const CanvasPath* path,
Expand All @@ -181,25 +155,20 @@ void SceneBuilder::pushPhysicalShape(const CanvasPath* path,
int clipBehavior) {
const SkPath& sk_path = path->path();
flow::Clip clip_behavior = static_cast<flow::Clip>(clipBehavior);
SkRect cullRect;
if (!cullRect.intersect(sk_path.getBounds(), cull_rects_.top())) {
cullRect = SkRect::MakeEmpty();
}
auto layer = std::make_unique<flow::PhysicalShapeLayer>(clip_behavior);
layer->set_path(sk_path);
layer->set_elevation(elevation);
layer->set_color(static_cast<SkColor>(color));
layer->set_shadow_color(static_cast<SkColor>(shadow_color));
layer->set_device_pixel_ratio(
UIDartState::Current()->window()->viewport_metrics().device_pixel_ratio);
PushLayer(std::move(layer), cullRect);
PushLayer(std::move(layer));
}

void SceneBuilder::pop() {
if (!current_layer_) {
return;
}
cull_rects_.pop();
current_layer_ = current_layer_->parent();
}

Expand All @@ -213,9 +182,6 @@ void SceneBuilder::addPicture(double dx,
SkPoint offset = SkPoint::Make(dx, dy);
SkRect pictureRect = picture->picture()->cullRect();
pictureRect.offset(offset.x(), offset.y());
if (!SkRect::Intersects(pictureRect, cull_rects_.top())) {
return;
}
auto layer = std::make_unique<flow::PictureLayer>();
layer->set_offset(offset);
layer->set_picture(UIDartState::CreateGPUObject(picture->picture()));
Expand Down Expand Up @@ -252,9 +218,6 @@ void SceneBuilder::addChildScene(double dx,
return;
}
SkRect sceneRect = SkRect::MakeXYWH(dx, dy, width, height);
if (!SkRect::Intersects(sceneRect, cull_rects_.top())) {
return;
}
auto layer = std::make_unique<flow::ChildSceneLayer>();
layer->set_offset(SkPoint::Make(dx, dy));
layer->set_size(SkSize::Make(width, height));
Expand Down Expand Up @@ -298,12 +261,9 @@ fml::RefPtr<Scene> SceneBuilder::build() {
return scene;
}

void SceneBuilder::PushLayer(std::unique_ptr<flow::ContainerLayer> layer,
const SkRect& cullRect) {
void SceneBuilder::PushLayer(std::unique_ptr<flow::ContainerLayer> layer) {
FML_DCHECK(layer);

cull_rects_.push(cullRect);

if (!root_layer_) {
root_layer_ = std::move(layer);
current_layer_ = root_layer_.get();
Expand Down
5 changes: 1 addition & 4 deletions lib/ui/compositing/scene_builder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,11 @@ class SceneBuilder : public RefCountedDartWrappable<SceneBuilder> {
std::unique_ptr<flow::ContainerLayer> root_layer_;
flow::ContainerLayer* current_layer_ = nullptr;

std::stack<SkRect> cull_rects_;

int rasterizer_tracing_threshold_ = 0;
bool checkerboard_raster_cache_images_ = false;
bool checkerboard_offscreen_layers_ = false;

void PushLayer(std::unique_ptr<flow::ContainerLayer> layer,
const SkRect& cullRect);
void PushLayer(std::unique_ptr<flow::ContainerLayer> layer);

FML_DISALLOW_COPY_AND_ASSIGN(SceneBuilder);
};
Expand Down

0 comments on commit 5550fdb

Please sign in to comment.