commit 95d19f3ba2ff10fd420dd553e6566b5478c6cf52
author Mike Klein <mtklein@chromium.org> Thu Jun 15 07:40:24 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Jun 17 00:23:32 2017 +0000
tree 28686c75433129cdb2ee9ec6c2e94006c6d70d3d
parent 741d7261f2eb1ab74d5a7c21319587206032f900

support g8 and 4444 in SkRPBlitter

BUG=skia:6766

Change-Id: I1bf8720cac24092352fd99d8d509252a10270b54
Reviewed-on: https://skia-review.googlesource.com/20020
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

src/core/SkRasterPipelineBlitter.cpp

diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index b3b4662..9cb9557 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -174,7 +174,9 @@
     if (paint.isDither()) {
         switch (dst.info().colorType()) {
             default:                     blitter->fDitherRate =     0.0f; break;
+            case kARGB_4444_SkColorType: blitter->fDitherRate =  1/15.0f; break;
             case   kRGB_565_SkColorType: blitter->fDitherRate =  1/63.0f; break;
+            case    kGray_8_SkColorType:
             case kRGBA_8888_SkColorType:
             case kBGRA_8888_SkColorType: blitter->fDitherRate = 1/255.0f; break;
         }
@@ -222,8 +224,10 @@
 void SkRasterPipelineBlitter::append_load_d(SkRasterPipeline* p) const {
     p->append(SkRasterPipeline::move_src_dst);
     switch (fDst.info().colorType()) {
+        case kGray_8_SkColorType:    p->append(SkRasterPipeline::load_g8,   &fDstPtr); break;
         case kAlpha_8_SkColorType:   p->append(SkRasterPipeline::load_a8,   &fDstPtr); break;
         case kRGB_565_SkColorType:   p->append(SkRasterPipeline::load_565,  &fDstPtr); break;
+        case kARGB_4444_SkColorType: p->append(SkRasterPipeline::load_4444, &fDstPtr); break;
         case kBGRA_8888_SkColorType:
         case kRGBA_8888_SkColorType: p->append(SkRasterPipeline::load_8888, &fDstPtr); break;
         case kRGBA_F16_SkColorType:  p->append(SkRasterPipeline::load_f16,  &fDstPtr); break;
@@ -252,8 +256,10 @@
         p->append(SkRasterPipeline::swap_rb);
     }
     switch (fDst.info().colorType()) {
+        case kGray_8_SkColorType:    p->append(SkRasterPipeline::luminance_to_alpha); // fallthru
         case kAlpha_8_SkColorType:   p->append(SkRasterPipeline::store_a8,   &fDstPtr); break;
         case kRGB_565_SkColorType:   p->append(SkRasterPipeline::store_565,  &fDstPtr); break;
+        case kARGB_4444_SkColorType: p->append(SkRasterPipeline::store_4444, &fDstPtr); break;
         case kBGRA_8888_SkColorType:
         case kRGBA_8888_SkColorType: p->append(SkRasterPipeline::store_8888, &fDstPtr); break;
         case kRGBA_F16_SkColorType:  p->append(SkRasterPipeline::store_f16,  &fDstPtr); break;