From 4a224f60111643f36d6f1c204142ce34511a32a1 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 5 Jan 2017 20:25:46 +0000 Subject: Revert "SkRasterPipelineBlitter: support A8" This reverts commit f44373c119290b501d4aec7385e16d12c28a1f0f. Reason for revert: MSAN Original change's description: > SkRasterPipelineBlitter: support A8 > > This adds support for loading and storing A8, then uses it in SkRasterPipelineBlitter. > > I think this handles all dst formats now: A8, 565, 8888 (by policy, sRGB only) and F16. > > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD > > > Change-Id: Id207f6e6c56b6bfcc301d77dd23e0959bb7afba8 > Reviewed-on: https://skia-review.googlesource.com/6554 > Reviewed-by: Mike Reed > Commit-Queue: Mike Klein > TBR=mtklein@chromium.org,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I9ead3c3335e1776e9a1639ca0481253821505d67 Reviewed-on: https://skia-review.googlesource.com/6625 Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- src/core/SkRasterPipeline.h | 1 - src/core/SkRasterPipelineBlitter.cpp | 5 +---- src/opts/SkNx_sse.h | 4 ---- src/opts/SkRasterPipeline_opts.h | 10 ---------- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index 4d8e9abec6..3b18b73470 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -65,7 +65,6 @@ M(from_srgb) M(from_srgb_d) M(to_srgb) \ M(from_2dot2) M(to_2dot2) \ M(constant_color) M(store_f32) \ - M(load_a8) M(load_a8_d) M(store_a8) \ M(load_565) M(load_565_d) M(store_565) \ M(load_f16) M(load_f16_d) M(store_f16) \ M(load_8888) M(load_8888_d) M(store_8888) \ diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp index 19e00dedf5..cbdb09faa4 100644 --- a/src/core/SkRasterPipelineBlitter.cpp +++ b/src/core/SkRasterPipelineBlitter.cpp @@ -79,10 +79,9 @@ SkBlitter* SkCreateRasterPipelineBlitter(const SkPixmap& dst, static bool supported(const SkImageInfo& info) { switch (info.colorType()) { - case kAlpha_8_SkColorType: return true; - case kRGB_565_SkColorType: return true; case kN32_SkColorType: return info.gammaCloseToSRGB(); case kRGBA_F16_SkColorType: return true; + case kRGB_565_SkColorType: return true; default: return false; } } @@ -188,7 +187,6 @@ void SkRasterPipelineBlitter::append_load_d(SkRasterPipeline* p) const { SkASSERT(supported(fDst.info())); switch (fDst.info().colorType()) { - case kAlpha_8_SkColorType: p->append(SkRasterPipeline::load_a8_d, &fDstPtr); break; case kRGB_565_SkColorType: p->append(SkRasterPipeline::load_565_d, &fDstPtr); break; case kBGRA_8888_SkColorType: case kRGBA_8888_SkColorType: p->append(SkRasterPipeline::load_8888_d, &fDstPtr); break; @@ -213,7 +211,6 @@ void SkRasterPipelineBlitter::append_store(SkRasterPipeline* p) const { SkASSERT(supported(fDst.info())); switch (fDst.info().colorType()) { - case kAlpha_8_SkColorType: p->append(SkRasterPipeline::store_a8, &fDstPtr); break; case kRGB_565_SkColorType: p->append(SkRasterPipeline::store_565, &fDstPtr); break; case kBGRA_8888_SkColorType: case kRGBA_8888_SkColorType: p->append(SkRasterPipeline::store_8888, &fDstPtr); break; diff --git a/src/opts/SkNx_sse.h b/src/opts/SkNx_sse.h index d52509a03e..394115626e 100644 --- a/src/opts/SkNx_sse.h +++ b/src/opts/SkNx_sse.h @@ -650,10 +650,6 @@ public: hi = _mm256_extractf128_si256(src.fVec, 1); return _mm_packus_epi32(lo, hi); } - template<> AI /*static*/ Sk8b SkNx_cast(const Sk8i& src) { - auto _16 = SkNx_cast(src); - return _mm_packus_epi16(_16.fVec, _16.fVec); - } #endif diff --git a/src/opts/SkRasterPipeline_opts.h b/src/opts/SkRasterPipeline_opts.h index b055c87afe..3b877ce156 100644 --- a/src/opts/SkRasterPipeline_opts.h +++ b/src/opts/SkRasterPipeline_opts.h @@ -503,16 +503,6 @@ STAGE_CTX(lerp_565, const uint16_t**) { a = 1.0f; } -STAGE_CTX(load_a8, const uint8_t**) { - auto ptr = *ctx + x; - r = g = b = 0.0f; - a = SkNf_from_byte(load(tail, ptr)); -} -STAGE_CTX(store_a8, uint8_t**) { - auto ptr = *ctx + x; - store(tail, SkNx_cast(SkNf_round(255.0f, a)), ptr); -} - STAGE_CTX(load_565, const uint16_t**) { auto ptr = *ctx + x; from_565(load(tail, ptr), &r,&g,&b); -- cgit v1.2.3