From 129ed1cd6d792f3f6cf563aefa9756fc6308289d Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 22 Feb 2016 06:42:31 -0800 Subject: lots of sRGB and F16 blits - generalize F16 xfermode procs - spriteblits for F16 and sRGB - saveLayer now respects colortype and profiletype BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1686013002 Review URL: https://codereview.chromium.org/1685203002 --- gm/xfermodes.cpp | 50 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) (limited to 'gm/xfermodes.cpp') diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index 9e87c04455..c1095747ad 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -293,55 +293,17 @@ private: DEF_GM( return new XfermodesGM; ) /////////////////////////////////////////////////////////////////////////////////////////////////// -#include "SkNx.h" - -static SkPMColor apply_proc(SkPMColor src, SkPMColor dst, SkXfermodeProc4f proc, float src_alpha) { - SkPM4f src4 = SkPM4f::FromPMColor(src); - for (int i = 0; i < 4; ++i) { - src4.fVec[i] *= src_alpha; - } - SkPM4f dst4 = SkPM4f::FromPMColor(dst); - SkPM4f res4 = proc(src4, dst4); - SkPMColor res; - SkNx_cast(Sk4f::Load(res4.fVec) * Sk4f(255) + Sk4f(0.5f)).store(&res); - return res; -} - -static bool apply_mode(const SkPixmap& res, const SkPixmap& src, const SkPixmap& dst, - SkXfermode* xfer, float src_alpha) { - SkXfermode::Mode mode; - if (!xfer) { - mode = SkXfermode::kSrcOver_Mode; - } else if (!xfer->asMode(&mode)) { - return false; - } - SkXfermodeProc4f proc = SkXfermode::GetProc4f(mode); - if (!proc) { - return false; - } - - for (int y = 0; y < res.height(); ++y) { - for (int x = 0; x < res.width(); ++x) { - *res.writable_addr32(x, y) = apply_proc(*src.addr32(x, y), *dst.addr32(x, y), - proc, src_alpha); - } - } - return true; -} void draw_mode(const SkBitmap& srcB, const SkBitmap& dstB, SkCanvas* canvas, SkXfermode* mode, SkScalar x, SkScalar y, float src_alpha) { - SkBitmap resB; - resB.allocN32Pixels(64, 64); + canvas->saveLayer(SkRect::MakeXYWH(x, y, 64, 64), nullptr); + canvas->drawBitmap(srcB, x, y, nullptr); - SkPixmap srcPM, dstPM, resPM; - srcB.peekPixels(&srcPM); - dstB.peekPixels(&dstPM); - resB.peekPixels(&resPM); + SkPaint paint; + paint.setXfermode(mode); + canvas->drawBitmap(dstB, x, y, &paint); - if (apply_mode(resPM, srcPM, dstPM, mode, src_alpha)) { - canvas->drawBitmap(resB, x, y, nullptr); - } + canvas->restore(); } DEF_SIMPLE_GM(xfermodes_proc4f, canvas, 1000, 1000) { -- cgit v1.2.3