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

Commit 11a986b

Browse files
author
jonahwilliams
committed
adjust sampling.
1 parent d855d78 commit 11a986b

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
../../../flutter/impeller/core/allocator_unittests.cc
145145
../../../flutter/impeller/display_list/aiks_dl_atlas_unittests.cc
146146
../../../flutter/impeller/display_list/aiks_dl_basic_unittests.cc
147+
../../../flutter/impeller/display_list/aiks_dl_blend_unittests.cc
147148
../../../flutter/impeller/display_list/aiks_dl_clip_unittests.cc
148149
../../../flutter/impeller/display_list/aiks_dl_gradient_unittests.cc
149150
../../../flutter/impeller/display_list/aiks_dl_opacity_unittests.cc

impeller/display_list/aiks_dl_blend_unittests.cc

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ TEST_P(AiksTest, BlendModePlusAlphaWideGamut) {
218218
SkSize::Make(texture->GetSize().width, texture->GetSize().height)),
219219
SkRect::MakeLTRB(rect.GetLeft(), rect.GetTop(), rect.GetRight(),
220220
rect.GetBottom()),
221-
DlImageSampling::kLinear, &paint);
221+
DlImageSampling::kNearestNeighbor, &paint);
222222
builder.Restore();
223223
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
224224
}
@@ -254,7 +254,7 @@ TEST_P(AiksTest, BlendModePlusAlphaColorFilterWideGamut) {
254254
SkSize::Make(texture->GetSize().width, texture->GetSize().height)),
255255
SkRect::MakeLTRB(rect.GetLeft(), rect.GetTop(), rect.GetRight(),
256256
rect.GetBottom()),
257-
DlImageSampling::kLinear, &paint);
257+
DlImageSampling::kNearestNeighbor, &paint);
258258
builder.Restore();
259259

260260
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
@@ -411,11 +411,13 @@ static sk_sp<DisplayList> BlendModeTest(Vector2 content_scale,
411411
builder.Save();
412412
builder.SaveLayer(nullptr, &paint);
413413
{
414-
builder.DrawImage(dst_image, {0, 0}, DlImageSampling::kLinear, &paint);
414+
builder.DrawImage(dst_image, {0, 0}, DlImageSampling::kNearestNeighbor,
415+
&paint);
415416

416417
paint.setColor(DlColor::kWhite().withAlpha(src_alpha * 255));
417418
paint.setBlendMode(static_cast<DlBlendMode>(blend_mode));
418-
builder.DrawImage(src_image, {0, 0}, DlImageSampling::kLinear, &paint);
419+
builder.DrawImage(src_image, {0, 0}, DlImageSampling::kNearestNeighbor,
420+
&paint);
419421
}
420422
builder.Restore();
421423
builder.Restore();
@@ -426,14 +428,16 @@ static sk_sp<DisplayList> BlendModeTest(Vector2 content_scale,
426428
DlPaint save_paint;
427429
builder.SaveLayer(nullptr, &save_paint);
428430
{
429-
builder.DrawImage(dst_image, {400, 0}, DlImageSampling::kLinear, nullptr);
431+
builder.DrawImage(dst_image, {400, 0}, DlImageSampling::kNearestNeighbor,
432+
nullptr);
430433

431434
DlPaint save_paint;
432435
save_paint.setColor(DlColor::kWhite().withAlpha(src_alpha * 255));
433436
save_paint.setBlendMode(static_cast<DlBlendMode>(blend_mode));
434437
builder.SaveLayer(nullptr, &save_paint);
435438
{
436-
builder.DrawImage(src_image, {400, 0}, DlImageSampling::kLinear, nullptr);
439+
builder.DrawImage(src_image, {400, 0}, DlImageSampling::kNearestNeighbor,
440+
nullptr);
437441
}
438442
builder.Restore();
439443
}
@@ -516,7 +520,7 @@ TEST_P(AiksTest, ForegroundPipelineBlendAppliesTransformCorrectly) {
516520
DlBlendMode::kSrcIn));
517521

518522
builder.DrawImage(DlImageImpeller::Make(texture), {200, 200},
519-
DlImageSampling::kLinear, &image_paint);
523+
DlImageSampling::kNearestNeighbor, &image_paint);
520524

521525
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
522526
}
@@ -534,7 +538,7 @@ TEST_P(AiksTest, ForegroundAdvancedBlendAppliesTransformCorrectly) {
534538
DlBlendMode::kColorDodge));
535539

536540
builder.DrawImage(DlImageImpeller::Make(texture), {200, 200},
537-
DlImageSampling::kLinear, &image_paint);
541+
DlImageSampling::kNearestNeighbor, &image_paint);
538542

539543
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
540544
}
@@ -548,14 +552,16 @@ TEST_P(AiksTest, FramebufferAdvancedBlendCoverage) {
548552
DisplayListBuilder builder;
549553

550554
DlPaint paint;
551-
paint.setColor(DlColor::kDarkGrey());
555+
paint.setColor(
556+
DlColor::RGBA(169.0f / 255.0f, 169.0f / 255.0f, 169.0f / 255.0f, 1.0f));
552557
builder.DrawPaint(paint);
553558
builder.Scale(0.4, 0.4);
554559

555560
DlPaint image_paint;
556561
image_paint.setBlendMode(DlBlendMode::kMultiply);
562+
557563
builder.DrawImage(DlImageImpeller::Make(texture), {20, 20},
558-
DlImageSampling::kLinear, &image_paint);
564+
DlImageSampling::kNearestNeighbor, &image_paint);
559565

560566
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
561567
}

0 commit comments

Comments
 (0)