diff options
| author |  Matt Sarett <msarett@google.com> | 2017-02-06 12:59:48 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:00:58 +0000 |
| commit | ecaaf6f1c156e5690200322fc2636380c1f63dd8 (patch) | |
| tree | a08ca843e15f8d9fd14b2d45f8a7916391052940 /bench | |
| parent | 041f7dfc577822f1e97721a865f86a9a02660cf9 (diff) | |
SkColorSpace: remove named API, add gamut API
BUG=skia:
Change-Id: I01c5e1874c9a034febc64e25b3aaafb5050393a6
Reviewed-on: https://skia-review.googlesource.com/8021
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/ColorCodecBench.cpp | 2 | ||||
| -rw-r--r-- | bench/GrMipMapBench.cpp | 2 | ||||
| -rw-r--r-- | bench/SkLinearBitmapPipelineBench.cpp | 2 | ||||
| -rw-r--r-- | bench/nanobench.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bench/ColorCodecBench.cpp b/bench/ColorCodecBench.cpp index 06afdc6565..867b8a1418 100644 --- a/bench/ColorCodecBench.cpp +++ b/bench/ColorCodecBench.cpp @@ -67,7 +67,7 @@ void ColorCodecBench::onDelayedSetup() { fDstSpace = nullptr; if (FLAGS_srgb) { - fDstSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); + fDstSpace = SkColorSpace::MakeSRGB(); } else if (FLAGS_nonstd) { SkColorSpaceTransferFn gamma; gamma.fA = 1.0f; diff --git a/bench/GrMipMapBench.cpp b/bench/GrMipMapBench.cpp index 56b66ced25..2037495bc0 100644 --- a/bench/GrMipMapBench.cpp +++ b/bench/GrMipMapBench.cpp @@ -36,7 +36,7 @@ protected: if (nullptr == context) { return; } - auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); + auto srgb = SkColorSpace::MakeSRGB(); SkImageInfo info = SkImageInfo::Make(fW, fH, kN32_SkColorType, kPremul_SkAlphaType, srgb); fSurface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info); diff --git a/bench/SkLinearBitmapPipelineBench.cpp b/bench/SkLinearBitmapPipelineBench.cpp index 039179823b..29f28895bf 100644 --- a/bench/SkLinearBitmapPipelineBench.cpp +++ b/bench/SkLinearBitmapPipelineBench.cpp @@ -93,7 +93,7 @@ struct CommonBitmapFPBenchmark : public Benchmark { sk_ignore_unused_variable(trash); fInfo = SkImageInfo::MakeN32Premul(width, height, fIsSRGB ? - SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : nullptr); + SkColorSpace::MakeSRGB() : nullptr); } bool isSuitableFor(Backend backend) override { diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 0f1e4825e2..92475d31f8 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -456,10 +456,10 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c kN32_SkColorType, kPremul_SkAlphaType, nullptr) CPU_CONFIG(565, kRaster_Backend, kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr) - auto srgbColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); + auto srgbColorSpace = SkColorSpace::MakeSRGB(); CPU_CONFIG(srgb, kRaster_Backend, kN32_SkColorType, kPremul_SkAlphaType, srgbColorSpace) - auto srgbLinearColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); + auto srgbLinearColorSpace = SkColorSpace::MakeSRGBLinear(); CPU_CONFIG(f16, kRaster_Backend, kRGBA_F16_SkColorType, kPremul_SkAlphaType, srgbLinearColorSpace) } |