commit 276a78573e911a3e2af5a3efb3cfcac5884e056e
author Mike Klein <mtklein@google.com> Sun Mar 15 08:46:09 2020 -0500
committer Mike Klein <mtklein@google.com> Sun Mar 15 20:14:58 2020 +0000
tree efcf490fd81804c1e6fd461f85030a8aee7344ce
parent 9a4ac6e86586a04ae61f48d6007b7ac03c96a35b

rearrange to emphasize most salient params

Move (x,y) up front for shaders, Color for color filters.

I did think about wrapping the other params in a struct, but
for now I still find it less error prone (while admittedly
more tedious) to have all those params in my face when adding,
removing, or refactoring parameters or effects.

Change-Id: I5e124f1ecea3eff9366872d5e77ddfbadc0302e3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/277111
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>

src/shaders/SkLocalMatrixShader.cpp

diff --git a/src/shaders/SkLocalMatrixShader.cpp b/src/shaders/SkLocalMatrixShader.cpp
index 8c8de53..eb8387c 100644
--- a/src/shaders/SkLocalMatrixShader.cpp
+++ b/src/shaders/SkLocalMatrixShader.cpp
@@ -75,16 +75,15 @@
 }
 
 
-skvm::Color SkLocalMatrixShader::onProgram(skvm::Builder* p,
+skvm::Color SkLocalMatrixShader::onProgram(skvm::Builder* p, skvm::F32 x, skvm::F32 y,
                                            const SkMatrix& ctm, const SkMatrix* localM,
                                            SkFilterQuality quality, SkColorSpace* dstCS,
-                                           skvm::Uniforms* uniforms, SkArenaAlloc* alloc,
-                                           skvm::F32 x, skvm::F32 y) const {
+                                           skvm::Uniforms* uniforms, SkArenaAlloc* alloc) const {
     SkTCopyOnFirstWrite<SkMatrix> lm(this->getLocalMatrix());
     if (localM) {
         lm.writable()->preConcat(*localM);
     }
-    return as_SB(fProxyShader)->program(p, ctm,lm.get(), quality,dstCS, uniforms,alloc, x,y);
+    return as_SB(fProxyShader)->program(p, x,y, ctm,lm.get(), quality,dstCS, uniforms,alloc);
 }
 
 sk_sp<SkShader> SkShader::makeWithLocalMatrix(const SkMatrix& localMatrix) const {
@@ -150,12 +149,11 @@
         return as_SB(fProxyShader)->appendStages(newRec);
     }
 
-    skvm::Color onProgram(skvm::Builder* p,
+    skvm::Color onProgram(skvm::Builder* p, skvm::F32 x, skvm::F32 y,
                           const SkMatrix& ctm, const SkMatrix* localM,
                           SkFilterQuality quality, SkColorSpace* dstCS,
-                          skvm::Uniforms* uniforms, SkArenaAlloc* alloc,
-                          skvm::F32 x, skvm::F32 y) const override {
-        return as_SB(fProxyShader)->program(p, fCTM,localM, quality,dstCS, uniforms,alloc, x,y);
+                          skvm::Uniforms* uniforms, SkArenaAlloc* alloc) const override {
+        return as_SB(fProxyShader)->program(p, x,y, fCTM,localM, quality,dstCS, uniforms,alloc);
     }
 
 private: