From 379938e47bc9edb6edfd21aabefa01aed71dd135 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Thu, 12 Jan 2017 18:34:29 -0500 Subject: Use RasterPipeline to support full precision on 16-bit RGBA pngs Reland of Original Change: https://skia-review.googlesource.com/6260 CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD Change-Id: I809984dd9af225103bfbe83492a17c19da7c5e40 Reviewed-on: https://skia-review.googlesource.com/6980 Reviewed-by: Matt Sarett Commit-Queue: Matt Sarett --- src/core/SkColorSpaceXform.cpp | 241 +++++++++++++++---------------------- src/core/SkColorSpaceXform_A2B.cpp | 5 + src/core/SkColorSpaceXform_Base.h | 24 ++-- src/core/SkRasterPipeline.h | 3 +- 4 files changed, 115 insertions(+), 158 deletions(-) (limited to 'src/core') diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp index b73a3cf198..bdb3784681 100644 --- a/src/core/SkColorSpaceXform.cpp +++ b/src/core/SkColorSpaceXform.cpp @@ -327,110 +327,14 @@ std::unique_ptr SkColorSpaceXform::New(SkColorSpace* srcSpace switch (csm) { case kNone_ColorSpaceMatch: - switch (dstSpaceXYZ->gammaNamed()) { - case kSRGB_SkGammaNamed: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - case k2Dot2Curve_SkGammaNamed: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - case kLinear_SkGammaNamed: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - default: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - } + return std::unique_ptr(new SkColorSpaceXform_XYZ + (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); case kGamut_ColorSpaceMatch: - switch (dstSpaceXYZ->gammaNamed()) { - case kSRGB_SkGammaNamed: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - case k2Dot2Curve_SkGammaNamed: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - case kLinear_SkGammaNamed: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - default: - if (srcSpaceXYZ->gammaIsLinear()) { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } else { - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } - } + return std::unique_ptr(new SkColorSpaceXform_XYZ + (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); case kFull_ColorSpaceMatch: - switch (dstSpaceXYZ->gammaNamed()) { - case kSRGB_SkGammaNamed: - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - case k2Dot2Curve_SkGammaNamed: - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - case kLinear_SkGammaNamed: - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - default: - return std::unique_ptr(new SkColorSpaceXform_XYZ - - (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); - } + return std::unique_ptr(new SkColorSpaceXform_XYZ + (srcSpaceXYZ, srcToDst, dstSpaceXYZ)); default: SkASSERT(false); return nullptr; @@ -1065,8 +969,8 @@ static AI int num_tables(SkColorSpace_XYZ* space) { } } -template -SkColorSpaceXform_XYZ +template +SkColorSpaceXform_XYZ ::SkColorSpaceXform_XYZ(SkColorSpace_XYZ* srcSpace, const SkMatrix44& srcToDst, SkColorSpace_XYZ* dstSpace) { @@ -1093,6 +997,29 @@ SkColorSpaceXform_XYZ const int numDstTables = num_tables(dstSpace); dstSpace->toDstGammaTables(fDstGammaTables, &fDstStorage, numDstTables); + + if (srcSpace->gammaIsLinear()) { + fSrcGamma = kLinear_SrcGamma; + } else if (kSRGB_SkGammaNamed == srcSpace->gammaNamed()) { + fSrcGamma = kSRGB_SrcGamma; + } else { + fSrcGamma = kTable_SrcGamma; + } + + switch (dstSpace->gammaNamed()) { + case kSRGB_SkGammaNamed: + fDstGamma = kSRGB_DstGamma; + break; + case k2Dot2Curve_SkGammaNamed: + fDstGamma = k2Dot2_DstGamma; + break; + case kLinear_SkGammaNamed: + fDstGamma = kLinear_DstGamma; + break; + default: + fDstGamma = kTable_DstGamma; + break; + } } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1119,27 +1046,28 @@ static AI bool apply_set_alpha(void* dst, const void* src, int len, SkAlphaType } } -template +template static AI bool apply_set_src(void* dst, const void* src, int len, SkAlphaType alphaType, const float* const srcTables[3], const float matrix[13], const uint8_t* const dstTables[3], - SkColorSpaceXform::ColorFormat srcColorFormat) { + SkColorSpaceXform::ColorFormat srcColorFormat, + SrcGamma srcGamma) { switch (srcColorFormat) { case SkColorSpaceXform::kRGBA_8888_ColorFormat: - switch (kSrc) { + switch (srcGamma) { case kLinear_SrcGamma: return apply_set_alpha (dst, src, len, alphaType, nullptr, matrix, dstTables); - case kTable_SrcGamma: + default: return apply_set_alpha (dst, src, len, alphaType, srcTables, matrix, dstTables); } case SkColorSpaceXform::kBGRA_8888_ColorFormat: - switch (kSrc) { + switch (srcGamma) { case kLinear_SrcGamma: return apply_set_alpha (dst, src, len, alphaType, nullptr, matrix, dstTables); - case kTable_SrcGamma: + default: return apply_set_alpha (dst, src, len, alphaType, srcTables, matrix, dstTables); } @@ -1150,8 +1078,8 @@ static AI bool apply_set_src(void* dst, const void* src, int len, SkAlphaType al #undef AI -template -bool SkColorSpaceXform_XYZ +template +bool SkColorSpaceXform_XYZ ::onApply(ColorFormat dstColorFormat, void* dst, ColorFormat srcColorFormat, const void* src, int len, SkAlphaType alphaType) const { @@ -1176,55 +1104,55 @@ bool SkColorSpaceXform_XYZ } } - if (kRGBA_F32_ColorFormat == dstColorFormat) { + if (kRGBA_F32_ColorFormat == dstColorFormat || kRGBA_U16_BE_ColorFormat == srcColorFormat) { return this->applyPipeline(dstColorFormat, dst, srcColorFormat, src, len, alphaType); } switch (dstColorFormat) { case kRGBA_8888_ColorFormat: - switch (kDst) { + switch (fDstGamma) { case kLinear_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); case kSRGB_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); case k2Dot2_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); case kTable_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, fDstGammaTables, - srcColorFormat); + srcColorFormat, fSrcGamma); } case kBGRA_8888_ColorFormat: - switch (kDst) { + switch (fDstGamma) { case kLinear_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); case kSRGB_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); case k2Dot2_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); case kTable_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, fDstGammaTables, - srcColorFormat); + srcColorFormat, fSrcGamma); } case kRGBA_F16_ColorFormat: - switch (kDst) { + switch (fDstGamma) { case kLinear_DstGamma: - return apply_set_src + return apply_set_src (dst, src, len, alphaType, fSrcGammaTables, fSrcToDst, nullptr, - srcColorFormat); + srcColorFormat, fSrcGamma); default: return false; } @@ -1242,8 +1170,8 @@ bool SkColorSpaceXform::apply(ColorFormat dstColorFormat, void* dst, ColorFormat /////////////////////////////////////////////////////////////////////////////////////////////////// -template -bool SkColorSpaceXform_XYZ +template +bool SkColorSpaceXform_XYZ ::applyPipeline(ColorFormat dstColorFormat, void* dst, ColorFormat srcColorFormat, const void* src, int len, SkAlphaType alphaType) const { SkRasterPipeline pipeline; @@ -1251,10 +1179,10 @@ bool SkColorSpaceXform_XYZ LoadTablesContext loadTables; switch (srcColorFormat) { case kRGBA_8888_ColorFormat: - if (kLinear_SrcGamma == kSrc) { + if (kLinear_SrcGamma == fSrcGamma) { pipeline.append(SkRasterPipeline::load_8888, &src); } else { - loadTables.fSrc = (const uint32_t*) src; + loadTables.fSrc = src; loadTables.fR = fSrcGammaTables[0]; loadTables.fG = fSrcGammaTables[1]; loadTables.fB = fSrcGammaTables[2]; @@ -1263,10 +1191,10 @@ bool SkColorSpaceXform_XYZ break; case kBGRA_8888_ColorFormat: - if (kLinear_SrcGamma == kSrc) { + if (kLinear_SrcGamma == fSrcGamma) { pipeline.append(SkRasterPipeline::load_8888, &src); } else { - loadTables.fSrc = (const uint32_t*) src; + loadTables.fSrc = src; loadTables.fR = fSrcGammaTables[2]; loadTables.fG = fSrcGammaTables[1]; loadTables.fB = fSrcGammaTables[0]; @@ -1275,6 +1203,24 @@ bool SkColorSpaceXform_XYZ pipeline.append(SkRasterPipeline::swap_rb); break; + case kRGBA_U16_BE_ColorFormat: + switch (fSrcGamma) { + case kLinear_SrcGamma: + pipeline.append(SkRasterPipeline::load_u16_be, &src); + break; + case kSRGB_SrcGamma: + pipeline.append(SkRasterPipeline::load_u16_be, &src); + pipeline.append_from_srgb(kUnpremul_SkAlphaType); + break; + case kTable_SrcGamma: + loadTables.fSrc = src; + loadTables.fR = fSrcGammaTables[0]; + loadTables.fG = fSrcGammaTables[1]; + loadTables.fB = fSrcGammaTables[2]; + pipeline.append(SkRasterPipeline::load_tables_u16_be, &loadTables); + break; + } + break; default: return false; } @@ -1296,7 +1242,7 @@ bool SkColorSpaceXform_XYZ } StoreTablesContext storeTables; - switch (kDst) { + switch (fDstGamma) { case kSRGB_DstGamma: pipeline.append(SkRasterPipeline::to_srgb); break; @@ -1309,7 +1255,7 @@ bool SkColorSpaceXform_XYZ switch (dstColorFormat) { case kRGBA_8888_ColorFormat: - if (kTable_DstGamma == kDst) { + if (kTable_DstGamma == fDstGamma) { storeTables.fDst = (uint32_t*) dst; storeTables.fR = fDstGammaTables[0]; storeTables.fG = fDstGammaTables[1]; @@ -1321,7 +1267,7 @@ bool SkColorSpaceXform_XYZ } break; case kBGRA_8888_ColorFormat: - if (kTable_DstGamma == kDst) { + if (kTable_DstGamma == fDstGamma) { storeTables.fDst = (uint32_t*) dst; storeTables.fR = fDstGammaTables[2]; storeTables.fG = fDstGammaTables[1]; @@ -1335,17 +1281,19 @@ bool SkColorSpaceXform_XYZ } break; case kRGBA_F16_ColorFormat: - if (kLinear_DstGamma != kDst) { + if (kLinear_DstGamma != fDstGamma) { return false; } pipeline.append(SkRasterPipeline::store_f16, &dst); break; case kRGBA_F32_ColorFormat: - if (kLinear_DstGamma != kDst) { + if (kLinear_DstGamma != fDstGamma) { return false; } pipeline.append(SkRasterPipeline::store_f32, &dst); break; + default: + return false; } pipeline.run(0, 0, len); @@ -1356,6 +1304,5 @@ bool SkColorSpaceXform_XYZ std::unique_ptr SlowIdentityXform(SkColorSpace_XYZ* space) { return std::unique_ptr(new SkColorSpaceXform_XYZ - - (space, SkMatrix::I(), space)); + (space, SkMatrix::I(), space)); } diff --git a/src/core/SkColorSpaceXform_A2B.cpp b/src/core/SkColorSpaceXform_A2B.cpp index f65df4c409..0f284e4a60 100644 --- a/src/core/SkColorSpaceXform_A2B.cpp +++ b/src/core/SkColorSpaceXform_A2B.cpp @@ -32,6 +32,9 @@ bool SkColorSpaceXform_A2B::onApply(ColorFormat dstFormat, void* dst, ColorForma case kRGBA_8888_ColorFormat: pipeline.append(SkRasterPipeline::load_8888, &src); break; + case kRGBA_U16_BE_ColorFormat: + pipeline.append(SkRasterPipeline::load_u16_be, &src); + break; default: SkCSXformPrintf("F16/F32 source color format not supported\n"); return false; @@ -63,6 +66,8 @@ bool SkColorSpaceXform_A2B::onApply(ColorFormat dstFormat, void* dst, ColorForma } pipeline.append(SkRasterPipeline::store_f32, &dst); break; + default: + return false; } pipeline.run(0,0, count); diff --git a/src/core/SkColorSpaceXform_Base.h b/src/core/SkColorSpaceXform_Base.h index e20857324d..48035c506b 100644 --- a/src/core/SkColorSpaceXform_Base.h +++ b/src/core/SkColorSpaceXform_Base.h @@ -34,6 +34,7 @@ private: enum SrcGamma { kLinear_SrcGamma, kTable_SrcGamma, + kSRGB_SrcGamma, }; enum DstGamma { @@ -49,7 +50,7 @@ enum ColorSpaceMatch { kFull_ColorSpaceMatch, }; -template +template class SkColorSpaceXform_XYZ : public SkColorSpaceXform_Base { protected: bool onApply(ColorFormat dstFormat, void* dst, ColorFormat srcFormat, const void* src, @@ -63,23 +64,26 @@ private: SkColorSpace_XYZ* dstSpace); // Contain pointers into storage or pointers into precomputed tables. - const float* fSrcGammaTables[3]; - SkAutoTMalloc fSrcStorage; - const uint8_t* fDstGammaTables[3]; - sk_sp fDstStorage; + const float* fSrcGammaTables[3]; + SkAutoTMalloc fSrcStorage; + const uint8_t* fDstGammaTables[3]; + sk_sp fDstStorage; // Holds a 3x4 matrix. Padding is useful for vector loading. - float fSrcToDst[13]; + float fSrcToDst[13]; + + SrcGamma fSrcGamma; + DstGamma fDstGamma; friend class SkColorSpaceXform; friend std::unique_ptr SlowIdentityXform(SkColorSpace_XYZ* space); }; struct LoadTablesContext { - const uint32_t* fSrc; - const float* fR; - const float* fG; - const float* fB; + const void* fSrc; + const float* fR; + const float* fG; + const float* fB; }; struct StoreTablesContext { diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index d235b43bd7..887e535e79 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -68,7 +68,8 @@ M(load_565) M(store_565) \ M(load_f16) M(store_f16) \ M(load_8888) M(store_8888) \ - M(load_tables) M(store_tables) \ + M(load_u16_be) \ + M(load_tables) M(load_tables_u16_be) M(store_tables) \ M(scale_u8) M(scale_1_float) \ M(lerp_u8) M(lerp_565) M(lerp_1_float) \ M(dstatop) M(dstin) M(dstout) M(dstover) \ -- cgit v1.2.3