From d47067392848ba132d4e86ffbeebe2dcacda9534 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 15 Nov 2016 16:44:34 -0500 Subject: make SkXfermode.h go away This is step one: - make SkXfermode useless to public clients - everything they should need is in SkBlendMode.h Step two: - remove SkXfermode.h entirely (since skia core will already be using SkXfermodePriv.h) BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4534 Change-Id: If2cea9f71df92430ed6644edb98dd306c5572cbc Reviewed-on: https://skia-review.googlesource.com/4534 Commit-Queue: Mike Reed Reviewed-by: Florin Malita --- tests/SkColor4fTest.cpp | 51 ------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'tests/SkColor4fTest.cpp') diff --git a/tests/SkColor4fTest.cpp b/tests/SkColor4fTest.cpp index 028b99f413..f268e5f42d 100644 --- a/tests/SkColor4fTest.cpp +++ b/tests/SkColor4fTest.cpp @@ -23,15 +23,6 @@ static bool nearly_equal(float a, float b, float tol = kTolerance) { return fabsf(a - b) <= tol; } -static bool nearly_equal(const SkPM4f a, const SkPM4f& b, float tol = kTolerance) { - for (int i = 0; i < 4; ++i) { - if (!nearly_equal(a.fVec[i], b.fVec[i], tol)) { - return false; - } - } - return true; -} - DEF_TEST(SkColor4f_FromColor, reporter) { const struct { SkColor fC; @@ -75,45 +66,3 @@ DEF_TEST(Color4f_premul, reporter) { REPORTER_ASSERT(reporter, nearly_equal(pm4.b(), c4.fA * c4.fB)); } } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -typedef SkPM4f (*SkXfermodeProc4f)(const SkPM4f& src, const SkPM4f& dst); - -static bool compare_procs(SkXfermodeProc proc32, SkXfermodeProc4f proc4f) { - const float kTolerance = 1.0f / 255; - - const SkColor colors[] = { - 0, 0xFF000000, 0xFFFFFFFF, 0x80FF0000 - }; - - for (auto s32 : colors) { - SkPMColor s_pm32 = SkPreMultiplyColor(s32); - SkPM4f s_pm4f = SkColor4f::FromColor(s32).premul(); - for (auto d32 : colors) { - SkPMColor d_pm32 = SkPreMultiplyColor(d32); - SkPM4f d_pm4f = SkColor4f::FromColor(d32).premul(); - - SkPMColor r32 = proc32(s_pm32, d_pm32); - SkPM4f r4f = proc4f(s_pm4f, d_pm4f); - - SkPM4f r32_4f = SkPM4f::FromPMColor(r32); - if (!nearly_equal(r4f, r32_4f, kTolerance)) { - return false; - } - } - } - return true; -} - -// Check that our Proc and Proc4f return (nearly) the same results -// -DEF_TEST(Color4f_xfermode_proc4f, reporter) { - // TODO: extend xfermodes so that all cases can be tested. - // - for (int mode = (int)SkBlendMode::kClear; mode <= (int)SkBlendMode::kScreen; ++mode) { - SkXfermodeProc proc32 = SkXfermode::GetProc((SkBlendMode)mode); - SkXfermodeProc4f proc4f = SkXfermode::GetProc4f((SkBlendMode)mode); - REPORTER_ASSERT(reporter, compare_procs(proc32, proc4f)); - } -} -- cgit v1.2.3