diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkColorSpaceXform.cpp | 23 | ||||
| -rw-r--r-- | src/core/SkColorSpaceXform_A2B.cpp | 3 | ||||
| -rw-r--r-- | src/core/SkNx.h | 16 | ||||
| -rw-r--r-- | src/core/SkRasterPipeline.h | 5 |
4 files changed, 3 insertions, 44 deletions
diff --git a/src/core/SkColorSpaceXform.cpp b/src/core/SkColorSpaceXform.cpp index dccb92ee9a..bdb3784681 100644 --- a/src/core/SkColorSpaceXform.cpp +++ b/src/core/SkColorSpaceXform.cpp @@ -1104,10 +1104,7 @@ bool SkColorSpaceXform_XYZ<kCSM> } } - if (kRGBA_F32_ColorFormat == dstColorFormat || - kRGBA_U16_BE_ColorFormat == srcColorFormat || - kRGB_U16_BE_ColorFormat == srcColorFormat) - { + if (kRGBA_F32_ColorFormat == dstColorFormat || kRGBA_U16_BE_ColorFormat == srcColorFormat) { return this->applyPipeline(dstColorFormat, dst, srcColorFormat, src, len, alphaType); } @@ -1224,24 +1221,6 @@ bool SkColorSpaceXform_XYZ<kCSM> break; } break; - case kRGB_U16_BE_ColorFormat: - switch (fSrcGamma) { - case kLinear_SrcGamma: - pipeline.append(SkRasterPipeline::load_rgb_u16_be, &src); - break; - case kSRGB_SrcGamma: - pipeline.append(SkRasterPipeline::load_rgb_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_rgb_u16_be, &loadTables); - break; - } - break; default: return false; } diff --git a/src/core/SkColorSpaceXform_A2B.cpp b/src/core/SkColorSpaceXform_A2B.cpp index 27c9faa971..6e49e84aee 100644 --- a/src/core/SkColorSpaceXform_A2B.cpp +++ b/src/core/SkColorSpaceXform_A2B.cpp @@ -31,9 +31,6 @@ bool SkColorSpaceXform_A2B::onApply(ColorFormat dstFormat, void* dst, ColorForma case kRGBA_U16_BE_ColorFormat: pipeline.append(SkRasterPipeline::load_u16_be, &src); break; - case kRGB_U16_BE_ColorFormat: - pipeline.append(SkRasterPipeline::load_rgb_u16_be, &src); - break; default: SkCSXformPrintf("F16/F32 source color format not supported\n"); return false; diff --git a/src/core/SkNx.h b/src/core/SkNx.h index 5df575342c..a75495cd2a 100644 --- a/src/core/SkNx.h +++ b/src/core/SkNx.h @@ -68,16 +68,6 @@ struct SkNx { *c = SkNx{cl, ch}; *d = SkNx{dl, dh}; } - AI static void Load3(const void* vptr, SkNx* a, SkNx* b, SkNx* c) { - auto ptr = (const char*)vptr; - Half al, bl, cl, - ah, bh, ch; - Half::Load3(ptr , &al, &bl, &cl); - Half::Load3(ptr + 3*N/2*sizeof(T), &ah, &bh, &ch); - *a = SkNx{al, ah}; - *b = SkNx{bl, bh}; - *c = SkNx{cl, ch}; - } AI static void Store4(void* vptr, const SkNx& a, const SkNx& b, const SkNx& c, const SkNx& d) { auto ptr = (char*)vptr; Half::Store4(ptr, a.fLo, b.fLo, c.fLo, d.fLo); @@ -159,12 +149,6 @@ struct SkNx<1,T> { *c = Load(ptr + 2*sizeof(T)); *d = Load(ptr + 3*sizeof(T)); } - AI static void Load3(const void* vptr, SkNx* a, SkNx* b, SkNx* c) { - auto ptr = (const char*)vptr; - *a = Load(ptr + 0*sizeof(T)); - *b = Load(ptr + 1*sizeof(T)); - *c = Load(ptr + 2*sizeof(T)); - } AI static void Store4(void* vptr, const SkNx& a, const SkNx& b, const SkNx& c, const SkNx& d) { auto ptr = (char*)vptr; a.store(ptr + 0*sizeof(T)); diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index 3d1bb88011..949146cc2d 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -69,9 +69,8 @@ M(load_565) M(store_565) \ M(load_f16) M(store_f16) \ M(load_8888) M(store_8888) \ - M(load_u16_be) M(load_rgb_u16_be) \ - M(load_tables_u16_be) M(load_tables_rgb_u16_be) \ - 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) \ |