commit eb50f434f0ff175153127875601e9bb3c0bfa5b5
author Mike Klein <mtklein@google.com> Fri Sep 07 11:08:53 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Sep 07 19:07:08 2018 +0000
tree ad07695debb05bc3c980a53f2f7e0acc6b6ec8a9
parent b5f23f398da513132c314efb0d0d14ab82d60ef6

add clamp_gamut

This should be cheaper in both float and lowp modes.

Change-Id: If6bba3abd31990b622f010c8fcdebff3288c9d70
Reviewed-on: https://skia-review.googlesource.com/152581
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkRasterPipeline.h

diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h
index be197e4..d637240 100644
--- a/src/core/SkRasterPipeline.h
+++ b/src/core/SkRasterPipeline.h
@@ -37,7 +37,7 @@
 #define SK_RASTER_PIPELINE_STAGES(M)                               \
     M(callback)                                                    \
     M(move_src_dst) M(move_dst_src)                                \
-    M(clamp_0) M(clamp_1) M(clamp_a) M(clamp_a_dst)                \
+    M(clamp_0) M(clamp_1) M(clamp_a) M(clamp_a_dst) M(clamp_gamut) \
     M(unpremul) M(premul) M(premul_dst)                            \
     M(force_opaque) M(force_opaque_dst)                            \
     M(set_rgb) M(swap_rb)                                          \

src/core/SkRasterPipelineBlitter.cpp

diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index 0ae6df3..5e4ec64 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -97,9 +97,7 @@
         dstInfo.colorType() != kRGBA_F32_SkColorType &&
         dstInfo.alphaType() == kPremul_SkAlphaType)
     {
-        // TODO: this will be common enough that we may want to fuse into ::clamp_premul.
-        p->append(SkRasterPipeline::clamp_0);
-        p->append(SkRasterPipeline::clamp_a);
+        p->append(SkRasterPipeline::clamp_gamut);
     }
 }
 

src/opts/SkRasterPipeline_opts.h

diff --git a/src/opts/SkRasterPipeline_opts.h b/src/opts/SkRasterPipeline_opts.h
index 0144bec..fb1f6a0 100644
--- a/src/opts/SkRasterPipeline_opts.h
+++ b/src/opts/SkRasterPipeline_opts.h
@@ -1276,6 +1276,13 @@
     db = min(db, da);
 }
 
+STAGE(clamp_gamut, Ctx::None) {
+    // If you're using this stage, a should already be in [0,1].
+    r = min(max(r, 0), a);
+    g = min(max(g, 0), a);
+    b = min(max(b, 0), a);
+}
+
 STAGE(set_rgb, const float* rgb) {
     r = rgb[0];
     g = rgb[1];
@@ -2573,6 +2580,11 @@
     db = min(db, da);
 }
 
+STAGE_PP(clamp_gamut, Ctx::None) {
+    // It shouldn't be possible to get out-of-gamut
+    // colors when working in lowp.
+}
+
 STAGE_PP(premul, Ctx::None) {
     r = div255(r * a);
     g = div255(g * a);