Skip to content

Strict source rect for sub-rect image draws (flutter/flutter#67881) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lslv1243 wants to merge 3 commits into
base: fibula/base-3.27.1
Choose a base branch
from
Open

Strict source rect for sub-rect image draws (flutter/flutter#67881) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1ec7d8
Strict source rect for sub-rect image draws (flutter/flutter#67881)
lslv1243 Aug 1, 2026
8c72862
Impeller: keep texture draw color filters when a stale image color so…
lslv1243 Aug 1, 2026
04faabf
style: apply clang-format to fork changes
lslv1243 Aug 1, 2026
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
19 changes: 14 additions & 5 deletions impeller/display_list/canvas.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,20 +734,29 @@ void Canvas::DrawImageRect(const std::shared_ptr<Texture>& image,
texture_contents->SetOpacity(paint.color.alpha);
texture_contents->SetDeferApplyingOpacity(paint.HasColorFilter());

// The texture is the source for this draw. The paint's color source is
// irrelevant here, but if left set (dispatchers persist attributes across
// ops and image draws don't re-sync it), Paint::WithColorFilter mistakes
// it for an image color source that already applied the color filter and
// skips the filter entirely.
Paint texture_paint = paint;
texture_paint.color_source = nullptr;

Entity entity;
entity.SetBlendMode(paint.blend_mode);
entity.SetBlendMode(texture_paint.blend_mode);
entity.SetTransform(GetCurrentTransform());

if (!paint.mask_blur_descriptor.has_value()) {
entity.SetContents(paint.WithFilters(std::move(texture_contents)));
if (!texture_paint.mask_blur_descriptor.has_value()) {
entity.SetContents(texture_paint.WithFilters(std::move(texture_contents)));
AddRenderEntityToCurrentPass(entity);
return;
}

RectGeometry out_rect(Rect{});

entity.SetContents(paint.WithFilters(
paint.mask_blur_descriptor->CreateMaskBlur(texture_contents, &out_rect)));
entity.SetContents(texture_paint.WithFilters(
texture_paint.mask_blur_descriptor->CreateMaskBlur(texture_contents,
&out_rect)));
AddRenderEntityToCurrentPass(entity);
}

Expand Down
13 changes: 7 additions & 6 deletions impeller/display_list/dl_dispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,12 +735,13 @@ void DlDispatcherBase::drawImageRect(
AUTO_DEPTH_WATCHER(1u);

GetCanvas().DrawImageRect(
image->impeller_texture(), // image
src, // source rect
dst, // destination rect
render_with_attributes ? paint_ : Paint(), // paint
skia_conversions::ToSamplerDescriptor(sampling) // sampling
);
image->impeller_texture(), // image
src, // source rect
dst, // destination rect
render_with_attributes ? paint_ : Paint(), // paint
skia_conversions::ToSamplerDescriptor(sampling), // sampling
constraint == SrcRectConstraint::kStrict ? SourceRectConstraint::kStrict
: SourceRectConstraint::kFast);
}

// |flutter::DlOpReceiver|
Expand Down
7 changes: 6 additions & 1 deletion lib/ui/painting/canvas.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,13 @@ Dart_Handle Canvas::drawImageRect(const CanvasImage* image,
DlPaint dl_paint;
const DlPaint* opt_paint =
paint.paint(dl_paint, kDrawImageRectWithPaintFlags);
// Sub-rect sources sample strictly so atlas cells cannot bleed neighbours
// (flutter/flutter#67881). Full-image draws keep kFast semantics.
const bool full_src =
src.contains(SkRect::MakeIWH(dl_image->width(), dl_image->height()));
builder()->DrawImageRect(dl_image, src, dst, sampling, opt_paint,
DlCanvas::SrcRectConstraint::kFast);
full_src ? DlCanvas::SrcRectConstraint::kFast
: DlCanvas::SrcRectConstraint::kStrict);
}
return Dart_Null();
}
Expand Down