From d4c7458f64270d605c04aa24e2171209c00a2d32 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Fri, 4 Jan 2019 17:07:44 +0000 Subject: Revert "Add SkColorSpace factory from 3x3 row-major gamut and transfer function" This reverts commit a9549ab31630fc244094e6f1692371cbaf87f666. Reason for revert: SKPs changed? Original change's description: > Add SkColorSpace factory from 3x3 row-major gamut and transfer function > > Moved named common transfer functions and gamuts to constexpr values in > SkColorSpace.h, in SkNamedTransferFn and SkNamedGamut namespaces. > > Converted nearly all SkColorSpace::MakeRGB calls within Skia to use the > new factory with the named values. Multiple clients want a way to > extract named transfer function and gamut - this still doesn't provide > that, but this may be a better path forward for honestly advertising how > SkColorSpace works internally. > > Bug: skia: > Change-Id: I9296d67e8f0dab5ceb49869cb3ba24e98a05f3c4 > Reviewed-on: https://skia-review.googlesource.com/c/180360 > Reviewed-by: Mike Klein > Reviewed-by: Brian Osman > Commit-Queue: Brian Osman TBR=mtklein@google.com,brianosman@google.com,reed@google.com Change-Id: Ie888f877b3c1dba33e1a8c0f5fa92594628de7fb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/c/181300 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- bench/ColorCanvasDrawBitmapBench.cpp | 2 +- bench/ColorSpaceXformBench.cpp | 4 ++-- bench/VertexColorSpaceBench.cpp | 4 ++-- bench/nanobench.cpp | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'bench') diff --git a/bench/ColorCanvasDrawBitmapBench.cpp b/bench/ColorCanvasDrawBitmapBench.cpp index a7877f4792..c150e7974b 100644 --- a/bench/ColorCanvasDrawBitmapBench.cpp +++ b/bench/ColorCanvasDrawBitmapBench.cpp @@ -54,5 +54,5 @@ DEF_BENCH(return new ColorCanvasDrawBitmap(nullptr, SkColorSpace::MakeSRGB(), "n DEF_BENCH(return new ColorCanvasDrawBitmap(SkColorSpace::MakeSRGB(), SkColorSpace::MakeSRGB(), "sRGB_to_sRGB");) DEF_BENCH(return new ColorCanvasDrawBitmap( - SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, SkNamedGamut::kAdobeRGB), + SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, SkColorSpace::kAdobeRGB_Gamut), SkColorSpace::MakeSRGB(), "AdobeRGB_to_sRGB");) diff --git a/bench/ColorSpaceXformBench.cpp b/bench/ColorSpaceXformBench.cpp index b7b6b7d68d..fc95e8e5ea 100644 --- a/bench/ColorSpaceXformBench.cpp +++ b/bench/ColorSpaceXformBench.cpp @@ -34,8 +34,8 @@ struct ColorSpaceXformBench : public Benchmark { void onDelayedSetup() override { sk_sp src = SkColorSpace::MakeSRGB(), - dst = SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, - SkNamedGamut::kDCIP3); + dst = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, + SkColorSpace::kDCIP3_D65_Gamut); fSteps = skstd::make_unique(src.get(), kOpaque_SkAlphaType, dst.get(), kPremul_SkAlphaType); diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp index 164a2b4ade..129d0ff6f1 100644 --- a/bench/VertexColorSpaceBench.cpp +++ b/bench/VertexColorSpaceBench.cpp @@ -257,8 +257,8 @@ public: GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); - auto p3 = SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, - SkNamedGamut::kDCIP3); + auto p3 = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, + SkColorSpace::kDCIP3_D65_Gamut); auto xform = GrColorSpaceXform::Make(sk_srgb_singleton(), kUnpremul_SkAlphaType, p3.get(), kUnpremul_SkAlphaType); diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 35fcefac01..21bed94212 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -478,7 +478,10 @@ static void create_config(const SkCommandLineConfig* config, SkTArray* c CPU_CONFIG(565, kRaster_Backend, kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr) // 'narrow' has a gamut narrower than sRGB, and different transfer function. - auto narrow = SkColorSpace::MakeRGB(SkNamedTransferFn::k2Dot2, gNarrow_toXYZD50), + SkMatrix44 narrow_gamut; + narrow_gamut.set3x3RowMajorf(gNarrow_toXYZD50); + + auto narrow = SkColorSpace::MakeRGB(k2Dot2Curve_SkGammaNamed, narrow_gamut), srgb = SkColorSpace::MakeSRGB(), srgbLinear = SkColorSpace::MakeSRGBLinear(); -- cgit v1.2.3