aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/arithmode.cpp
diff options
context:
space:
mode:
authorGravatar ericrk <ericrk@chromium.org>2015-10-19 14:41:11 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-19 14:41:11 -0700
commitaf96fce87937aba4aa5d394ee6316ba790308490 (patch)
treed58a842fdf7df8f29f54fbd8aa622f4afcc672a2 /gm/arithmode.cpp
parentdeb8146fac665d78f9a1fe745389807d69a79142 (diff)
The SkArithmeticMode_gpu GL filters support clamping to valid
premultiplied colors, however the flag for whether or not to do this, which is present in their parent filters, is dropped when creating the GL implementations. This change adds logic to forward the value from the parent filter to the GL implementation. This makes GPU behavior match software and fixes a WebKit LayoutTest. See referenced bug. BUG=473186 Review URL: https://codereview.chromium.org/1410553002
Diffstat (limited to 'gm/arithmode.cpp')
-rw-r--r--gm/arithmode.cpp36
1 files changed, 35 insertions, 1 deletions
diff --git a/gm/arithmode.cpp b/gm/arithmode.cpp
index 53385ea6ab..1e50e892f7 100644
--- a/gm/arithmode.cpp
+++ b/gm/arithmode.cpp
@@ -78,7 +78,7 @@ protected:
return SkString("arithmode");
}
- virtual SkISize onISize() { return SkISize::Make(640, 480); }
+ virtual SkISize onISize() { return SkISize::Make(640, 572); }
virtual void onDraw(SkCanvas* canvas) {
SkBitmap src = make_src();
@@ -122,6 +122,40 @@ protected:
k += 4;
y += SkIntToScalar(src.height() + 12);
}
+
+ // Draw two special cases to test enforcePMColor. In these cases, we
+ // draw the dst bitmap twice, the first time it is halved and inverted,
+ // leading to invalid premultiplied colors. If we enforcePMColor, these
+ // invalid values should be clamped, and will not contribute to the
+ // second draw.
+ for (int i = 0; i < 2; i++) {
+ const bool enforcePMColor = (i == 0);
+ SkScalar x = gap;
+ canvas->drawBitmap(dst, x, y, nullptr);
+ x += gap;
+ SkRect rect = SkRect::MakeXYWH(x, y, SkIntToScalar(WW), SkIntToScalar(HH));
+ canvas->saveLayer(&rect, nullptr);
+ SkXfermode* xfer1 = SkArithmeticMode::Create(0, -one / 2, 0, 1, enforcePMColor);
+ SkPaint paint1;
+ paint1.setXfermode(xfer1)->unref();
+ canvas->drawBitmap(dst, x, y, &paint1);
+ SkXfermode* xfer2 = SkArithmeticMode::Create(0, one / 2, -one, 1);
+ SkPaint paint2;
+ paint2.setXfermode(xfer2)->unref();
+ canvas->drawBitmap(dst, x, y, &paint2);
+ canvas->restore();
+ x += gap;
+
+ // Label
+ SkPaint paint;
+ paint.setTextSize(SkIntToScalar(24));
+ paint.setAntiAlias(true);
+ sk_tool_utils::set_portable_typeface(&paint);
+ SkString str(enforcePMColor ? "enforcePM" : "no enforcePM");
+ canvas->drawText(str.c_str(), str.size(), x, y + paint.getTextSize(), paint);
+
+ y += SkIntToScalar(src.height() + 12);
+ }
}
private: