constant means constant

Strip all the "constant" verbiage out of stages that really just mean 1, single, scalar.

CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD

Change-Id: I3d71202b348fadc3ced8ecb6c18c939cf92d7243
Reviewed-on: https://skia-review.googlesource.com/5396
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h
index 01b581f..9e8f8f7 100644 (file)
--- a/src/core/SkRasterPipeline.h
+++ b/src/core/SkRasterPipeline.h
@@ -65,8 +65,8 @@
     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)                    \
-    M(scale_u8) M(scale_constant_float)                          \
-    M(lerp_u8) M(lerp_565) M(lerp_constant_float)                \
+    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)                     \
     M(srcatop) M(srcin) M(srcout) M(srcover)                     \
     M(clear) M(modulate) M(multiply) M(plus_) M(screen) M(xor_)  \

diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index 075da1a..d7d66cf 100644 (file)
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -57,9 +57,9 @@ private:
 
     // These values are pointed to by the compiled blit functions
     // above, which allows us to adjust them from call to call.
-    void*       fDstPtr           = nullptr;
-    const void* fMaskPtr          = nullptr;
-    float       fConstantCoverage = 0.0f;
+    void*       fDstPtr          = nullptr;
+    const void* fMaskPtr         = nullptr;
+    float       fCurrentCoverage = 0.0f;
 
     // Scratch space for shaders and color filters to use.
     char            fScratch[64];
@@ -120,7 +120,7 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
             return earlyOut();
         }
         if (!is_opaque) {
-            pipeline->append(SkRasterPipeline::scale_constant_float,
+            pipeline->append(SkRasterPipeline::scale_1_float,
                              &paintColor->fVec[SkPM4f::A]);
         }
 
@@ -223,13 +223,13 @@ void SkRasterPipelineBlitter::blitAntiH(int x, int y, const SkAlpha aa[], const
         SkRasterPipeline p;
         p.extend(fShader);
         if (fBlend == SkBlendMode::kSrcOver) {
-            p.append(SkRasterPipeline::scale_constant_float, &fConstantCoverage);
+            p.append(SkRasterPipeline::scale_1_float, &fCurrentCoverage);
             this->append_load_d(&p);
             this->append_blend(&p);
         } else {
             this->append_load_d(&p);
             this->append_blend(&p);
-            p.append(SkRasterPipeline::lerp_constant_float, &fConstantCoverage);
+            p.append(SkRasterPipeline::lerp_1_float, &fCurrentCoverage);
         }
         this->maybe_clamp(&p);
         this->append_store(&p);
@@ -242,7 +242,7 @@ void SkRasterPipelineBlitter::blitAntiH(int x, int y, const SkAlpha aa[], const
             case 0x00:                       break;
             case 0xff: this->blitH(x,y,run); break;
             default:
-                fConstantCoverage = *aa * (1/255.0f);
+                fCurrentCoverage = *aa * (1/255.0f);
                 fBlitAntiH(x,y, run);
         }
         x    += run;

diff --git a/src/opts/SkRasterPipeline_opts.h b/src/opts/SkRasterPipeline_opts.h
index 5be1b0c..8834e95 100644 (file)
--- a/src/opts/SkRasterPipeline_opts.h
+++ b/src/opts/SkRasterPipeline_opts.h
@@ -336,8 +336,8 @@ STAGE(constant_color) {
     a = color->a();
 }
 
-// s' = sc for a constant c.
-STAGE(scale_constant_float) {
+// s' = sc for a scalar c.
+STAGE(scale_1_float) {
     SkNf c = *(const float*)ctx;
 
     r *= c;
@@ -360,8 +360,8 @@ SI SkNf lerp(const SkNf& from, const SkNf& to, const SkNf& cov) {
     return SkNx_fma(to-from, cov, from);
 }
 
-// s' = d(1-c) + sc, for a constant c.
-STAGE(lerp_constant_float) {
+// s' = d(1-c) + sc, for a scalar c.
+STAGE(lerp_1_float) {
     SkNf c = *(const float*)ctx;
 
     r = lerp(dr, r, c);