Add base effect for gpu 2pt conical gradients

Add base effect for gpu 2pt conical gradients

This is in preparation to add more "sub-effects" for the various fast path cases for 2 pt conical gradients

BUG=skia:

Committed: http://code.google.com/p/skia/source/detail?r=14059

[robertphillips, 2014-04-03 19:20:25]

lgtm

https://codereview.chromium.org/224083002/diff/40001/src/effects/gradients/Sk...
File src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp (right):

https://codereview.chromium.org/224083002/diff/40001/src/effects/gradients/Sk...
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:74:
Default2PtConicalEffect(GrContext* ctx,
fix indent?

[egdaniel, 2014-04-04 13:22:35]

The CQ bit was checked by egdaniel@google.com

[commit-bot: I haz the power, 2014-04-04 13:22:37]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/egdaniel@google.com/224083002/60001

[commit-bot: I haz the power, 2014-04-04 13:22:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-04 13:22:40]

Failed to apply patch for
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
  Hunk #4 FAILED at 143.
  Hunk #8 succeeded at 384 with fuzz 2.
  1 out of 8 hunks FAILED -- saving rejects to file
src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp.rej

Patch:       src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index
e98d3baac6213f9c2752e0702d8e1d98c6dc6135..797567ffa217b1cbfd68d1a956964c1b082f23c4
100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -4,6 +4,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #if SK_SUPPORT_GPU
 #include "SkTwoPointConicalGradient_gpu.h"
 #include "GrTBackendEffectFactory.h"
@@ -13,11 +14,105 @@
 // For brevity
 typedef GrGLUniformManager::UniformHandle UniformHandle;
 
-class GrGL2PtConicalGradientEffect : public GrGLGradientEffect {
+//////////////////////////////////////////////////////////////////////////////
+
+static void set_matrix_default_conical(const SkTwoPointConicalGradient& shader,
+                                       SkMatrix* invLMatrix) {
+    // Inverse of the current local matrix is passed in then,
+    // translate to center1, rotate so center2 is on x axis.
+    const SkPoint& center1 = shader.getStartCenter();
+    const SkPoint& center2 = shader.getEndCenter();
+
+    invLMatrix->postTranslate(-center1.fX, -center1.fY);
+
+    SkPoint diff = center2 - center1;
+    SkScalar diffLen = diff.length();
+    if (0 != diffLen) {
+        SkScalar invDiffLen = SkScalarInvert(diffLen);
+        SkMatrix rot;
+        rot.setSinCos(-SkScalarMul(invDiffLen, diff.fY),
+                       SkScalarMul(invDiffLen, diff.fX));
+        invLMatrix->postConcat(rot);
+    }
+}
+
+class GLDefault2PtConicalEffect;
+
+class Default2PtConicalEffect : public GrGradientEffect {
 public:
 
-    GrGL2PtConicalGradientEffect(const GrBackendEffectFactory& factory, const
GrDrawEffect&);
-    virtual ~GrGL2PtConicalGradientEffect() { }
+    static GrEffectRef* Create(GrContext* ctx,
+                               const SkTwoPointConicalGradient& shader,
+                               const SkMatrix& matrix,
+                               SkShader::TileMode tm) {
+        AutoEffectUnref effect(SkNEW_ARGS(Default2PtConicalEffect, (ctx,
shader, matrix, tm)));
+        return CreateEffectRef(effect);
+    }
+
+    virtual ~Default2PtConicalEffect() { }
+
+    static const char* Name() { return "Two-Point Conical Gradient"; }
+    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+
+    // The radial gradient parameters can collapse to a linear (instead of
quadratic) equation.
+    bool isDegenerate() const { return SkScalarAbs(fDiffRadius) ==
SkScalarAbs(fCenterX1); }
+    SkScalar center() const { return fCenterX1; }
+    SkScalar diffRadius() const { return fDiffRadius; }
+    SkScalar radius() const { return fRadius0; }
+
+    typedef GLDefault2PtConicalEffect GLEffect;
+
+private:
+    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
+        const Default2PtConicalEffect& s =
CastEffect<Default2PtConicalEffect>(sBase);
+        return (INHERITED::onIsEqual(sBase) &&
+                this->fCenterX1 == s.fCenterX1 &&
+                this->fRadius0 == s.fRadius0 &&
+                this->fDiffRadius == s.fDiffRadius);
+    }
+
+    Default2PtConicalEffect(GrContext* ctx,
+                            const SkTwoPointConicalGradient& shader,
+                            const SkMatrix& matrix,
+                            SkShader::TileMode tm)
+        : INHERITED(ctx, shader, matrix, tm),
+        fCenterX1(shader.getCenterX1()),
+        fRadius0(shader.getStartRadius()),
+        fDiffRadius(shader.getDiffRadius()) {
+        // We pass the linear part of the quadratic as a varying.
+        //    float b = -2.0 * (fCenterX1 * x + fRadius0 * fDiffRadius * z)
+        fBTransform = this->getCoordTransform();
+        SkMatrix& bMatrix = *fBTransform.accessMatrix();
+        SkScalar r0dr = SkScalarMul(fRadius0, fDiffRadius);
+        bMatrix[SkMatrix::kMScaleX] = -2 * (SkScalarMul(fCenterX1,
bMatrix[SkMatrix::kMScaleX]) +
+                                            SkScalarMul(r0dr,
bMatrix[SkMatrix::kMPersp0]));
+        bMatrix[SkMatrix::kMSkewX] = -2 * (SkScalarMul(fCenterX1,
bMatrix[SkMatrix::kMSkewX]) +
+                                           SkScalarMul(r0dr,
bMatrix[SkMatrix::kMPersp1]));
+        bMatrix[SkMatrix::kMTransX] = -2 * (SkScalarMul(fCenterX1,
bMatrix[SkMatrix::kMTransX]) +
+                                            SkScalarMul(r0dr,
bMatrix[SkMatrix::kMPersp2]));
+        this->addCoordTransform(&fBTransform);
+    }
+
+    GR_DECLARE_EFFECT_TEST;
+
+    // @{
+    // Cache of values - these can change arbitrarily, EXCEPT
+    // we shouldn't change between degenerate and non-degenerate?!
+
+    GrCoordTransform fBTransform;
+    SkScalar         fCenterX1;
+    SkScalar         fRadius0;
+    SkScalar         fDiffRadius;
+
+    // @}
+
+    typedef GrGradientEffect INHERITED;
+};
+
+class GLDefault2PtConicalEffect : public GrGLGradientEffect {
+public:
+    GLDefault2PtConicalEffect(const GrBackendEffectFactory& factory, const
GrDrawEffect&);
+    virtual ~GLDefault2PtConicalEffect() { }
 
     virtual void emitCode(GrGLShaderBuilder*,
                           const GrDrawEffect&,
@@ -31,7 +126,6 @@ public:
     static EffectKey GenKey(const GrDrawEffect&, const GrGLCaps& caps);
 
 protected:
-
     UniformHandle fParamUni;
 
     const char* fVSVaryingName;
@@ -49,40 +143,17 @@ protected:
     // @}
 
 private:
-    
     typedef GrGLGradientEffect INHERITED;
 
 };
 
-const GrBackendEffectFactory& Gr2PtConicalGradientEffect::getFactory() const {
-    return GrTBackendEffectFactory<Gr2PtConicalGradientEffect>::getInstance();
-}
-    
-Gr2PtConicalGradientEffect::Gr2PtConicalGradientEffect(GrContext* ctx,
-                                                         const
SkTwoPointConicalGradient& shader,
-                                                         const SkMatrix&
matrix,
-                                                         SkShader::TileMode tm)
:
-    INHERITED(ctx, shader, matrix, tm),
-    fCenterX1(shader.getCenterX1()),
-    fRadius0(shader.getStartRadius()),
-    fDiffRadius(shader.getDiffRadius()) {
-    // We pass the linear part of the quadratic as a varying.
-    //    float b = -2.0 * (fCenterX1 * x + fRadius0 * fDiffRadius * z)
-    fBTransform = this->getCoordTransform();
-    SkMatrix& bMatrix = *fBTransform.accessMatrix();
-    SkScalar r0dr = SkScalarMul(fRadius0, fDiffRadius);
-    bMatrix[SkMatrix::kMScaleX] = -2 * (SkScalarMul(fCenterX1,
bMatrix[SkMatrix::kMScaleX]) +
-                                        SkScalarMul(r0dr,
bMatrix[SkMatrix::kMPersp0]));
-    bMatrix[SkMatrix::kMSkewX] = -2 * (SkScalarMul(fCenterX1,
bMatrix[SkMatrix::kMSkewX]) +
-                                       SkScalarMul(r0dr,
bMatrix[SkMatrix::kMPersp1]));
-    bMatrix[SkMatrix::kMTransX] = -2 * (SkScalarMul(fCenterX1,
bMatrix[SkMatrix::kMTransX]) +
-                                        SkScalarMul(r0dr,
bMatrix[SkMatrix::kMPersp2]));
-    this->addCoordTransform(&fBTransform);
+const GrBackendEffectFactory& Default2PtConicalEffect::getFactory() const {
+    return GrTBackendEffectFactory<Default2PtConicalEffect>::getInstance();
 }
 
-GR_DEFINE_EFFECT_TEST(Gr2PtConicalGradientEffect);
+GR_DEFINE_EFFECT_TEST(Default2PtConicalEffect);
 
-GrEffectRef* Gr2PtConicalGradientEffect::TestCreate(SkRandom* random,
+GrEffectRef* Default2PtConicalEffect::TestCreate(SkRandom* random,
                                             GrContext* context,
                                             const GrDrawTargetCaps&,
                                             GrTexture**) {
@@ -112,7 +183,7 @@ GrEffectRef*
Gr2PtConicalGradientEffect::TestCreate(SkRandom* random,
 
 /////////////////////////////////////////////////////////////////////
 
-GrGL2PtConicalGradientEffect::GrGL2PtConicalGradientEffect(const
GrBackendEffectFactory& factory,
+GLDefault2PtConicalEffect::GLDefault2PtConicalEffect(const
GrBackendEffectFactory& factory,
                                            const GrDrawEffect& drawEffect)
     : INHERITED(factory)
     , fVSVaryingName(NULL)
@@ -121,11 +192,11 @@
GrGL2PtConicalGradientEffect::GrGL2PtConicalGradientEffect(const GrBackendEffect
     , fCachedRadius(-SK_ScalarMax)
     , fCachedDiffRadius(-SK_ScalarMax) {
 
-    const Gr2PtConicalGradientEffect& data =
drawEffect.castEffect<Gr2PtConicalGradientEffect>();
+    const Default2PtConicalEffect& data =
drawEffect.castEffect<Default2PtConicalEffect>();
     fIsDegenerate = data.isDegenerate();
 }
 
-void GrGL2PtConicalGradientEffect::emitCode(GrGLShaderBuilder* builder,
+void GLDefault2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
                                     const GrDrawEffect&,
                                     EffectKey key,
                                     const char* outputColor,
@@ -254,10 +325,10 @@ void
GrGL2PtConicalGradientEffect::emitCode(GrGLShaderBuilder* builder,
     }
 }
 
-void GrGL2PtConicalGradientEffect::setData(const GrGLUniformManager& uman,
+void GLDefault2PtConicalEffect::setData(const GrGLUniformManager& uman,
                                    const GrDrawEffect& drawEffect) {
     INHERITED::setData(uman, drawEffect);
-    const Gr2PtConicalGradientEffect& data =
drawEffect.castEffect<Gr2PtConicalGradientEffect>();
+    const Default2PtConicalEffect& data = drawEffect.castEffect…
(message too large)

[egdaniel, 2014-04-04 13:34:59]

The CQ bit was checked by egdaniel@google.com

[commit-bot: I haz the power, 2014-04-04 13:35:07]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/egdaniel@google.com/224083002/80001

[commit-bot: I haz the power, 2014-04-04 13:50:52]

Change committed as 14059