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/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index 075da1a..d7d66cf 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -57,9 +57,9 @@
// 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 @@
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 @@
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 @@
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;