diff options
author | brianosman <brianosman@google.com> | 2016-06-16 11:41:44 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-16 11:41:44 -0700 |
commit | ab8241880d09eb1774b4993ca6df048a27b7020c (patch) | |
tree | f3c7e4c1873771ee818e0a1c86515a3ea5250d75 /bench | |
parent | 6a61a875467646f8dbc37cfecf49e12d1f475170 (diff) |
Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType (patchset #10 id:180001 of https://codereview.chromium.org/2069173002/ )
Reason for revert:
Mac crashes in GrUploadPixmapToTexture
Original issue's description:
> Lots of progress on switching to SkColorSpace rather than SkColorProfileType
>
> Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld).
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002
>
> Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170
TBR=reed@google.com,herb@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2072813002
Diffstat (limited to 'bench')
-rw-r--r-- | bench/GrMipMapBench.cpp | 2 | ||||
-rw-r--r-- | bench/nanobench.cpp | 33 | ||||
-rw-r--r-- | bench/nanobench.h | 2 |
3 files changed, 18 insertions, 19 deletions
diff --git a/bench/GrMipMapBench.cpp b/bench/GrMipMapBench.cpp index 096256c6cc..f4e05a0ac7 100644 --- a/bench/GrMipMapBench.cpp +++ b/bench/GrMipMapBench.cpp @@ -37,7 +37,7 @@ protected: return; } SkImageInfo info = SkImageInfo::Make(fW, fH, kN32_SkColorType, kPremul_SkAlphaType, - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)); + kSRGB_SkColorProfileType); fSurface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info); } diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 94402cc770..e5a63a022d 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -424,7 +424,7 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c Benchmark::kGPU_Backend, kN32_SkColorType, kPremul_SkAlphaType, - nullptr, + kLinear_SkColorProfileType, sampleCount, ctxType, ctxOptions, @@ -436,29 +436,28 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c } #endif - #define CPU_CONFIG(name, backend, color, alpha, colorSpace) \ - if (config->getTag().equals(#name)) { \ - Config config = { \ - SkString(#name), Benchmark::backend, color, alpha, colorSpace, \ - 0, kBogusContextType, kBogusContextOptions, false \ - }; \ - configs->push_back(config); \ - return; \ + #define CPU_CONFIG(name, backend, color, alpha, profile) \ + if (config->getTag().equals(#name)) { \ + Config config = { \ + SkString(#name), Benchmark::backend, color, alpha, profile, \ + 0, kBogusContextType, kBogusContextOptions, false \ + }; \ + configs->push_back(config); \ + return; \ } if (FLAGS_cpu) { CPU_CONFIG(nonrendering, kNonRendering_Backend, - kUnknown_SkColorType, kUnpremul_SkAlphaType, nullptr) + kUnknown_SkColorType, kUnpremul_SkAlphaType, kLinear_SkColorProfileType); CPU_CONFIG(8888, kRaster_Backend, - kN32_SkColorType, kPremul_SkAlphaType, nullptr) + kN32_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType) CPU_CONFIG(565, kRaster_Backend, - kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr) - auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named); + kRGB_565_SkColorType, kOpaque_SkAlphaType, kLinear_SkColorProfileType) CPU_CONFIG(srgb, kRaster_Backend, - kN32_SkColorType, kPremul_SkAlphaType, srgbColorSpace) + kN32_SkColorType, kPremul_SkAlphaType, kSRGB_SkColorProfileType) CPU_CONFIG(f16, kRaster_Backend, - kRGBA_F16_SkColorType, kPremul_SkAlphaType, nullptr) + kRGBA_F16_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType) } #undef CPU_CONFIG @@ -466,7 +465,7 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK if (config->getTag().equals("hwui")) { Config config = { SkString("hwui"), Benchmark::kHWUI_Backend, - kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr, + kRGBA_8888_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType, 0, kBogusContextType, kBogusContextOptions, false }; configs->push_back(config); } @@ -489,7 +488,7 @@ static Target* is_enabled(Benchmark* bench, const Config& config) { } SkImageInfo info = SkImageInfo::Make(bench->getSize().fX, bench->getSize().fY, - config.color, config.alpha, config.colorSpace); + config.color, config.alpha, config.profile); Target* target = nullptr; diff --git a/bench/nanobench.h b/bench/nanobench.h index ce1e33ec4f..ceab0f6c4f 100644 --- a/bench/nanobench.h +++ b/bench/nanobench.h @@ -26,7 +26,7 @@ struct Config { Benchmark::Backend backend; SkColorType color; SkAlphaType alpha; - sk_sp<SkColorSpace> colorSpace; + SkColorProfileType profile; int samples; #if SK_SUPPORT_GPU sk_gpu_test::GrContextFactory::ContextType ctxType; |