diff options
author | Brian Osman <brianosman@google.com> | 2018-09-26 18:49:27 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-09-26 22:30:05 +0000 |
commit | 5ea41fc89b264f2cab7058bf48429f87761f65e9 (patch) | |
tree | 8d7a0dc16a03f993d23db6d215b81537eb96553f /bench/ColorSpaceXformBench.cpp | |
parent | 7a3197bae3ca3bee20f7d7157f2778c159ecf09a (diff) | |
download | skqp-5ea41fc89b264f2cab7058bf48429f87761f65e9.tar.gz |
Remove more SkColorSpaceXform (and friends)
- gammaencodedpremul GM was just demonstrating something that we
understand well (and have much better testing for).
- readpixels GM was filled with workarounds for things that are no
longer true (unpremul images, clamped F16).
- Other uses can be switched to SkConvertPixels trivially.
- Remove SkColorSpaceXformPriv and SkColorLookUpTable, all unused.
- Remove SkColorSpaceXform_skcms.cpp, no longer referenced by clients.
Bug: skia:
Change-Id: I7298bb53aa61b49ad1398ebc504d35c119fd5cf4
Reviewed-on: https://skia-review.googlesource.com/157153
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'bench/ColorSpaceXformBench.cpp')
-rw-r--r-- | bench/ColorSpaceXformBench.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/bench/ColorSpaceXformBench.cpp b/bench/ColorSpaceXformBench.cpp index 1a76228d9a..7bddac6a06 100644 --- a/bench/ColorSpaceXformBench.cpp +++ b/bench/ColorSpaceXformBench.cpp @@ -8,7 +8,6 @@ #include "../src/jumper/SkJumper.h" #include "Benchmark.h" #include "SkColor.h" -#include "SkColorSpaceXform.h" #include "SkColorSpaceXformer.h" #include "SkColorSpaceXformSteps.h" #include "SkMakeUnique.h" @@ -16,14 +15,13 @@ #include "SkRandom.h" #include "SkRasterPipeline.h" -enum class Mode { xform, steps, pipeA, pipeB, xformer }; +enum class Mode { steps, pipeA, pipeB, xformer }; struct ColorSpaceXformBench : public Benchmark { ColorSpaceXformBench(Mode mode) : fMode(mode) {} const Mode fMode; - std::unique_ptr<SkColorSpaceXform> fXform; std::unique_ptr<SkColorSpaceXformSteps> fSteps; std::function<void(size_t, size_t, size_t, size_t)> fPipeA; @@ -35,7 +33,6 @@ struct ColorSpaceXformBench : public Benchmark { const char* onGetName() override { switch (fMode) { - case Mode::xform : return "ColorSpaceXformBench_xform"; case Mode::steps : return "ColorSpaceXformBench_steps"; case Mode::pipeA : return "ColorSpaceXformBench_pipeA"; case Mode::pipeB : return "ColorSpaceXformBench_pipeB"; @@ -51,7 +48,6 @@ struct ColorSpaceXformBench : public Benchmark { dst = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, SkColorSpace::kDCIP3_D65_Gamut); - fXform = SkColorSpaceXform::New(src.get(), dst.get()); fSteps = skstd::make_unique<SkColorSpaceXformSteps>(src.get(), kOpaque_SkAlphaType, dst.get(), kPremul_SkAlphaType); @@ -76,12 +72,6 @@ struct ColorSpaceXformBench : public Benchmark { fPipeDst.pixels = &dst; switch (fMode) { - case Mode::xform: { - fXform->apply(SkColorSpaceXform::kBGRA_8888_ColorFormat, &dst, - SkColorSpaceXform::kBGRA_8888_ColorFormat, &src, - 1, kUnpremul_SkAlphaType); - } break; - case Mode::steps: { float rgba[4]; swizzle_rb(Sk4f_fromL32(src)).store(rgba); @@ -116,7 +106,6 @@ struct ColorSpaceXformBench : public Benchmark { } }; -DEF_BENCH(return new ColorSpaceXformBench{Mode::xform };) DEF_BENCH(return new ColorSpaceXformBench{Mode::steps };) DEF_BENCH(return new ColorSpaceXformBench{Mode::pipeA };) DEF_BENCH(return new ColorSpaceXformBench{Mode::pipeB };) |