diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-05-29 12:22:10 -0400 |
|---|---|---|
| committer |  Mike Klein <mtklein@google.com> | 2018-05-29 19:14:03 +0000 |
| commit | cdbec8f197e3a75185e95ff66afb3edb49097bde (patch) | |
| tree | dcc7738094962538cd2f59b549f144a552f1251b /dm | |
| parent | a33447dab9b9ebdc0bd636b6ec7721557d21feac (diff) | |
remove bit, srgbnl config in DM
We're not going to need the bit.
I've rewritten "esrgb" and "srgbnl" to express themselves the way I'd
like them to work. Their images are supressed in Gold already.
Change-Id: I6da58cc75dcb998cbfcf9a8f65de31c030adb494
Reviewed-on: https://skia-review.googlesource.com/130506
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -903,21 +903,19 @@ static Sink* create_sink(const GrContextOptions& grCtxOptions, const SkCommandLi if (FLAGS_cpu) { auto srgbColorSpace = SkColorSpace::MakeSRGB(); auto srgbLinearColorSpace = SkColorSpace::MakeSRGBLinear(); - auto esrgb = SkColorSpace::MakeSRGB()->makeNonlinearBlending(); SINK("g8", RasterSink, kGray_8_SkColorType); SINK("565", RasterSink, kRGB_565_SkColorType); SINK("4444", RasterSink, kARGB_4444_SkColorType); SINK("8888", RasterSink, kN32_SkColorType); - SINK("srgb", RasterSink, kN32_SkColorType, srgbColorSpace); SINK("rgba", RasterSink, kRGBA_8888_SkColorType); SINK("bgra", RasterSink, kBGRA_8888_SkColorType); SINK("rgbx", RasterSink, kRGB_888x_SkColorType); SINK("1010102", RasterSink, kRGBA_1010102_SkColorType); SINK("101010x", RasterSink, kRGB_101010x_SkColorType); SINK("f16", RasterSink, kRGBA_F16_SkColorType, srgbLinearColorSpace); - SINK("esrgb", RasterSink, kRGBA_F16_SkColorType, esrgb); - SINK("srgbnl", RasterSink, kRGBA_8888_SkColorType, esrgb); + SINK("esrgb", RasterSink, kRGBA_F16_SkColorType, srgbColorSpace); + SINK("srgbnl", RasterSink, kRGBA_8888_SkColorType, srgbColorSpace); SINK("t8888", ThreadedSink, kN32_SkColorType); SINK("pdf", PDFSink, false, SK_ScalarDefaultRasterDPI); SINK("skp", SKPSink); @@ -928,6 +926,9 @@ static Sink* create_sink(const GrContextOptions& grCtxOptions, const SkCommandLi SINK("pdfa", PDFSink, true, SK_ScalarDefaultRasterDPI); SINK("pdf300", PDFSink, false, 300); SINK("jsdebug", DebugSink); + + // TODO: kRGBA_sRGB_SkColorType / srgbLinearColorSpace? + SINK("srgb", RasterSink, kN32_SkColorType, srgbColorSpace); } #undef SINK return nullptr; |