DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] Move all remaining Rect construction to named factories (flutter/engine#47582)

Browse Source 
The named factories provide better readability and do not imply an internal storage format (which will be changing soon).
This commit is contained in:
Jim Graham 2023-11-01 19:03:09 -07:00 committed by GitHub
parent 3ead96c860
commit edba128d44
21 changed files with 80 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/flutter/impeller/aiks/canvas.cc
View File

@ -271,8 +271,9 @@ void Canvas::DrawRRect(Rect rect, Scalar corner_radius, const Paint& paint) {
void Canvas::DrawCircle(Point center, Scalar radius, const Paint& paint) {
Size half_size(radius, radius);
if (AttemptDrawBlurredRRect(Rect(center - half_size, half_size * 2), radius,
paint)) {
if (AttemptDrawBlurredRRect(
Rect::MakeOriginSize(center - half_size, half_size * 2), radius,
paint)) {
return;
}
auto circle_path =

7
engine/src/flutter/impeller/entity/contents/clip_contents.cc
View File

@ -93,7 +93,7 @@ bool ClipContents::Render(const ContentContext& renderer,
{
DEBUG_COMMAND_INFO(cmd, "Difference Clip (Increment)");
auto points = Rect(Size(pass.GetRenderTargetSize())).GetPoints();
auto points = Rect::MakeSize(pass.GetRenderTargetSize()).GetPoints();
auto vertices =
VertexBufferBuilder<VS::PerVertexData>{}
.AddVertices({{points[0]}, {points[1]}, {points[2]}, {points[3]}})
@ -188,8 +188,9 @@ bool ClipRestoreContents::Render(const ContentContext& renderer,
// Create a rect that covers either the given restore area, or the whole
// render target texture.
auto ltrb = restore_coverage_.value_or(Rect(Size(pass.GetRenderTargetSize())))
.GetLTRB();
auto ltrb =
restore_coverage_.value_or(Rect::MakeSize(pass.GetRenderTargetSize()))
.GetLTRB();
VertexBufferBuilder<VS::PerVertexData> vtx_builder;
vtx_builder.AddVertices({
{Point(ltrb[0], ltrb[1])},

4
engine/src/flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
View File

@ -164,9 +164,7 @@ std::optional<Rect> BorderMaskBlurFilterContents::GetFilterCoverage(
auto transformed_blur_vector =
transform.TransformDirection(Vector2(Radius{sigma_x_}.radius, 0)).Abs() +
transform.TransformDirection(Vector2(0, Radius{sigma_y_}.radius)).Abs();
auto extent = coverage->size + transformed_blur_vector * 2;
return Rect(coverage->origin - transformed_blur_vector,
Size(extent.x, extent.y));
return coverage->Expand(transformed_blur_vector);
}
std::optional<Rect> BorderMaskBlurFilterContents::GetFilterSourceCoverage(

10
engine/src/flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc
View File

@ -106,12 +106,10 @@ std::optional<Entity> DirectionalGaussianBlurFilterContents::RenderFilter(
std::optional<Rect> expanded_coverage_hint;
if (coverage_hint.has_value()) {
auto r =
Size(transformed_blur_radius_length, transformed_blur_radius_length)
Point(transformed_blur_radius_length, transformed_blur_radius_length)
.Abs();
expanded_coverage_hint =
is_second_pass_ ? coverage_hint
: Rect(coverage_hint.value().origin - r,
Size(coverage_hint.value().size + r * 2));
is_second_pass_ ? coverage_hint : coverage_hint->Expand(r);
}
auto input_snapshot = inputs[0]->GetSnapshot("GaussianBlur", renderer, entity,
expanded_coverage_hint);
@ -317,9 +315,7 @@ std::optional<Rect> DirectionalGaussianBlurFilterContents::GetFilterCoverage(
auto transformed_blur_vector =
transform.TransformDirection(blur_direction_ * Radius{blur_sigma_}.radius)
.Abs();
auto extent = coverage->size + transformed_blur_vector * 2;
return Rect(coverage->origin - transformed_blur_vector,
Size(extent.x, extent.y));
return coverage->Expand(transformed_blur_vector);
}
} // namespace impeller

4
engine/src/flutter/impeller/entity/contents/filters/morphology_filter_contents.cc
View File

@ -96,7 +96,7 @@ std::optional<Entity> DirectionalMorphologyFilterContents::RenderFilter(
auto transformed_radius =
transform.TransformDirection(direction_ * radius_.radius);
auto transformed_texture_vertices =
Rect(Size(input_snapshot->texture->GetSize()))
Rect::MakeSize(input_snapshot->texture->GetSize())
.GetTransformedPoints(input_snapshot->transform);
auto transformed_texture_width =
transformed_texture_vertices[0].GetDistance(
@ -189,7 +189,7 @@ std::optional<Rect> DirectionalMorphologyFilterContents::GetFilterCoverage(
if (size.x < 0 || size.y < 0) {
return Rect::MakeSize(Size(0, 0));
}
return Rect(origin, Size(size.x, size.y));
return Rect::MakeOriginSize(origin, Size(size.x, size.y));
}
std::optional<Rect>

2
engine/src/flutter/impeller/entity/contents/tiled_texture_contents.cc
View File

@ -128,7 +128,7 @@ bool TiledTextureContents::Render(const ContentContext& renderer,
auto& host_buffer = pass.GetTransientsBuffer();
auto geometry_result = GetGeometry()->GetPositionUVBuffer(
Rect({0, 0}, Size(texture_size)), GetInverseEffectTransform(), renderer,
Rect::MakeSize(texture_size), GetInverseEffectTransform(), renderer,
entity, pass);
bool uses_emulated_tile_mode =
UsesEmulatedTileMode(renderer.GetDeviceCapabilities());

10
engine/src/flutter/impeller/entity/entity_pass.cc
View File

@ -569,11 +569,11 @@ EntityPass::EntityResult EntityPass::GetEntityForElement(
// The maximum coverage of the subpass. Subpasses textures should never
// extend outside the parent pass texture or the current clip coverage.
auto coverage_limit =
Rect(global_pass_position, Size(pass_context.GetPassTarget()
.GetRenderTarget()
.GetRenderTargetSize()))
.Intersection(clip_coverage_back.value());
auto coverage_limit = Rect::MakeOriginSize(global_pass_position,
Size(pass_context.GetPassTarget()
.GetRenderTarget()
.GetRenderTargetSize()))
.Intersection(clip_coverage_back.value());
if (!coverage_limit.has_value()) {
capture.CreateChild("Subpass Entity (Skipped: Empty coverage limit A)");
return EntityPass::EntityResult::Skip();

4
engine/src/flutter/impeller/entity/geometry/cover_geometry.cc
View File

@ -15,7 +15,7 @@ CoverGeometry::~CoverGeometry() = default;
GeometryResult CoverGeometry::GetPositionBuffer(const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) {
auto rect = Rect(Size(pass.GetRenderTargetSize()));
auto rect = Rect::MakeSize(pass.GetRenderTargetSize());
constexpr uint16_t kRectIndicies[4] = {0, 1, 2, 3};
auto& host_buffer = pass.GetTransientsBuffer();
return GeometryResult{
@ -44,7 +44,7 @@ GeometryResult CoverGeometry::GetPositionUVBuffer(
const ContentContext& renderer,
const Entity& entity,
RenderPass& pass) {
auto rect = Rect(Size(pass.GetRenderTargetSize()));
auto rect = Rect::MakeSize(pass.GetRenderTargetSize());
return ComputeUVGeometryForRect(rect, texture_coverage, effect_transform,
renderer, entity, pass);
}

4
engine/src/flutter/impeller/entity/geometry/stroke_path_geometry.cc
View File

@ -522,9 +522,7 @@ std::optional<Rect> StrokePathGeometry::GetCoverage(
.TransformDirection(Vector2(max_radius, max_radius) *
std::max(stroke_width_, min_size))
.Abs();
return Rect(path_coverage.origin - max_radius_xy,
Size(path_coverage.size.width + max_radius_xy.x * 2,
path_coverage.size.height + max_radius_xy.y * 2));
return path_coverage.Expand(max_radius_xy);
}
} // namespace impeller

30
engine/src/flutter/impeller/geometry/geometry_unittests.cc
View File

@ -1580,36 +1580,6 @@ TEST(GeometryTest, CanConvertBetweenDegressAndRadians) {
}
}
TEST(GeometryTest, RectMakeSize) {
{
Size s(100, 200);
Rect r = Rect::MakeSize(s);
Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
ASSERT_RECT_NEAR(r, expected);
}
{
ISize s(100, 200);
Rect r = Rect::MakeSize(s);
Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
ASSERT_RECT_NEAR(r, expected);
}
{
Size s(100, 200);
IRect r = IRect::MakeSize(s);
IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
ASSERT_EQ(r, expected);
}
{
ISize s(100, 200);
IRect r = IRect::MakeSize(s);
IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
ASSERT_EQ(r, expected);
}
}
TEST(GeometryTest, RectUnion) {
{
Rect a = Rect::MakeXYWH(100, 100, 100, 100);

2
engine/src/flutter/impeller/geometry/path.cc
View File

@ -425,7 +425,7 @@ void Path::ComputeBounds() {
auto min = min_max->first;
auto max = min_max->second;
const auto difference = max - min;
computed_bounds_ = Rect{min.x, min.y, difference.x, difference.y};
computed_bounds_ = Rect::MakeXYWH(min.x, min.y, difference.x, difference.y);
}
std::optional<Rect> Path::GetTransformedBoundingBox(

2
engine/src/flutter/impeller/geometry/path_builder.cc
View File

@ -196,7 +196,7 @@ PathBuilder& PathBuilder::AddRect(Rect rect) {
}
PathBuilder& PathBuilder::AddCircle(const Point& c, Scalar r) {
return AddOval(Rect{c.x - r, c.y - r, 2.0f * r, 2.0f * r});
return AddOval(Rect::MakeXYWH(c.x - r, c.y - r, 2.0f * r, 2.0f * r));
}
PathBuilder& PathBuilder::AddRoundedRect(Rect rect, Scalar radius) {

15
engine/src/flutter/impeller/geometry/rect.h
View File

@ -25,14 +25,6 @@ struct TRect {
constexpr TRect() : origin({0, 0}), size({0, 0}) {}
constexpr TRect(TSize<Type> size) : origin({0.0, 0.0}), size(size) {}
constexpr TRect(TPoint<Type> origin, TSize<Type> size)
: origin(origin), size(size) {}
constexpr TRect(Type x, Type y, Type width, Type height)
: origin(x, y), size(width, height) {}
constexpr static TRect MakeLTRB(Type left,
Type top,
Type right,
@ -363,6 +355,13 @@ struct TRect {
const std::optional<TRect> b) {
return a.has_value() ? Intersection(a.value(), b) : b;
}
private:
constexpr TRect(Type x, Type y, Type width, Type height)
: origin(x, y), size(width, height) {}
constexpr TRect(TPoint<Type> origin, TSize<Type> size)
: origin(origin), size(size) {}
};
using Rect = TRect<Scalar>;

32
engine/src/flutter/impeller/geometry/rect_unittests.cc
View File

@ -6,6 +6,8 @@
#include "flutter/impeller/geometry/rect.h"
#include "flutter/impeller/geometry/geometry_asserts.h"
namespace impeller {
namespace testing {
@ -23,5 +25,35 @@ TEST(RectTest, RectOriginSizeGetters) {
}
}
TEST(RectTest, RectMakeSize) {
{
Size s(100, 200);
Rect r = Rect::MakeSize(s);
Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
ASSERT_RECT_NEAR(r, expected);
}
{
ISize s(100, 200);
Rect r = Rect::MakeSize(s);
Rect expected = Rect::MakeLTRB(0, 0, 100, 200);
ASSERT_RECT_NEAR(r, expected);
}
{
Size s(100, 200);
IRect r = IRect::MakeSize(s);
IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
ASSERT_EQ(r, expected);
}
{
ISize s(100, 200);
IRect r = IRect::MakeSize(s);
IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
ASSERT_EQ(r, expected);
}
}
} // namespace testing
} // namespace impeller

2
engine/src/flutter/impeller/golden_tests/golden_tests.cc
View File

@ -78,7 +78,7 @@ TEST_F(GoldenTests, ConicalGradient) {
paint.stroke_width = 0.0;
paint.style = Paint::Style::kFill;
canvas.DrawRect(Rect(10, 10, 250, 250), paint);
canvas.DrawRect(Rect::MakeXYWH(10, 10, 250, 250), paint);
Picture picture = canvas.EndRecordingAsPicture();
auto aiks_context =

8
engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc
View File

@ -145,12 +145,12 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
auto buffer = bd->context->GetResourceAllocator()->CreateBuffer(buffer_desc);
buffer->SetLabel(impeller::SPrintF("ImGui vertex+index buffer"));
auto display_rect =
impeller::Rect(draw_data->DisplayPos.x, draw_data->DisplayPos.y,
draw_data->DisplaySize.x, draw_data->DisplaySize.y);
auto display_rect = impeller::Rect::MakeXYWH(
draw_data->DisplayPos.x, draw_data->DisplayPos.y,
draw_data->DisplaySize.x, draw_data->DisplaySize.y);
auto viewport = impeller::Viewport{
.rect = impeller::Rect(
.rect = impeller::Rect::MakeXYWH(
display_rect.origin.x * draw_data->FramebufferScale.x,
display_rect.origin.y * draw_data->FramebufferScale.y,
display_rect.size.width * draw_data->FramebufferScale.x,

2
engine/src/flutter/impeller/renderer/blit_pass.cc
View File

@ -66,7 +66,7 @@ bool BlitPass::AddCopy(std::shared_ptr<Texture> source,
// Clip the destination image.
source_region = source_region->Intersection(
IRect(-destination_origin, destination->GetSize()));
IRect::MakeOriginSize(-destination_origin, destination->GetSize()));
if (!source_region.has_value()) {
return true; // Nothing to blit.
}

2
engine/src/flutter/impeller/renderer/render_pass.cc
View File

@ -50,7 +50,7 @@ bool RenderPass::AddCommand(Command&& command) {
}
if (command.scissor.has_value()) {
auto target_rect = IRect({}, render_target_.GetRenderTargetSize());
auto target_rect = IRect::MakeSize(render_target_.GetRenderTargetSize());
if (!target_rect.Contains(command.scissor.value())) {
VALIDATION_LOG << "Cannot apply a scissor that lies outside the bounds "
"of the render target.";

2
engine/src/flutter/impeller/renderer/snapshot.cc
View File

@ -12,7 +12,7 @@ std::optional<Rect> Snapshot::GetCoverage() const {
if (!texture) {
return std::nullopt;
}
return Rect(Size(texture->GetSize())).TransformBounds(transform);
return Rect::MakeSize(texture->GetSize()).TransformBounds(transform);
}
std::optional<Matrix> Snapshot::GetUVTransform() const {

6
engine/src/flutter/impeller/typographer/backends/stb/text_frame_stb.cc
View File

@ -55,9 +55,9 @@ std::shared_ptr<TextFrame> MakeTextFrameSTB(
std::optional<Rect> result;
for (const auto& glyph_position : run.GetGlyphPositions()) {
Rect glyph_rect =
Rect(glyph_position.position + glyph_position.glyph.bounds.origin,
glyph_position.glyph.bounds.size);
Rect glyph_rect = Rect::MakeOriginSize(
glyph_position.position + glyph_position.glyph.bounds.origin,
glyph_position.glyph.bounds.size);
result = result.has_value() ? result->Union(glyph_rect) : glyph_rect;
}

12
engine/src/flutter/impeller/typographer/text_frame.cc
View File

@ -45,14 +45,14 @@ bool TextFrame::MaybeHasOverlapping() const {
// accumulated bounds rect. This gives faster but less precise information
// on text runs.
auto first_position = glyph_positions[0];
auto overlapping_rect =
Rect(first_position.position + first_position.glyph.bounds.origin,
first_position.glyph.bounds.size);
auto overlapping_rect = Rect::MakeOriginSize(
first_position.position + first_position.glyph.bounds.origin,
first_position.glyph.bounds.size);
for (auto i = 1u; i < glyph_positions.size(); i++) {
auto glyph_position = glyph_positions[i];
auto glyph_rect =
Rect(glyph_position.position + glyph_position.glyph.bounds.origin,
glyph_position.glyph.bounds.size);
auto glyph_rect = Rect::MakeOriginSize(
glyph_position.position + glyph_position.glyph.bounds.origin,
glyph_position.glyph.bounds.size);
auto intersection = glyph_rect.Intersection(overlapping_rect);
if (intersection.has_value()) {
return true;