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
Review-Url: https://codereview.chromium.org/2069173002
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index e5a63a0..94402cc 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -424,7 +424,7 @@
Benchmark::kGPU_Backend,
kN32_SkColorType,
kPremul_SkAlphaType,
- kLinear_SkColorProfileType,
+ nullptr,
sampleCount,
ctxType,
ctxOptions,
@@ -436,28 +436,29 @@
}
#endif
- #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; \
+ #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; \
}
if (FLAGS_cpu) {
CPU_CONFIG(nonrendering, kNonRendering_Backend,
- kUnknown_SkColorType, kUnpremul_SkAlphaType, kLinear_SkColorProfileType);
+ kUnknown_SkColorType, kUnpremul_SkAlphaType, nullptr)
CPU_CONFIG(8888, kRaster_Backend,
- kN32_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType)
+ kN32_SkColorType, kPremul_SkAlphaType, nullptr)
CPU_CONFIG(565, kRaster_Backend,
- kRGB_565_SkColorType, kOpaque_SkAlphaType, kLinear_SkColorProfileType)
+ kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr)
+ auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
CPU_CONFIG(srgb, kRaster_Backend,
- kN32_SkColorType, kPremul_SkAlphaType, kSRGB_SkColorProfileType)
+ kN32_SkColorType, kPremul_SkAlphaType, srgbColorSpace)
CPU_CONFIG(f16, kRaster_Backend,
- kRGBA_F16_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType)
+ kRGBA_F16_SkColorType, kPremul_SkAlphaType, nullptr)
}
#undef CPU_CONFIG
@@ -465,7 +466,7 @@
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
if (config->getTag().equals("hwui")) {
Config config = { SkString("hwui"), Benchmark::kHWUI_Backend,
- kRGBA_8888_SkColorType, kPremul_SkAlphaType, kLinear_SkColorProfileType,
+ kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr,
0, kBogusContextType, kBogusContextOptions, false };
configs->push_back(config);
}
@@ -488,7 +489,7 @@
}
SkImageInfo info = SkImageInfo::Make(bench->getSize().fX, bench->getSize().fY,
- config.color, config.alpha, config.profile);
+ config.color, config.alpha, config.colorSpace);
Target* target = nullptr;