diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-17 13:57:31 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-17 13:57:31 +0000 |
commit | 7518ff2d7e2a3f63b8d60f8ccacd7ca5e6b525b7 (patch) | |
tree | 4764986afb7c669de01c088f7c89d4bc306b66ba /src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp | |
parent | cf41935735544a412ea66afd31470b418a586213 (diff) |
Revert of Add flipped gradient branch to two point conical gradient (https://codereview.chromium.org/227623004/)
Reason for revert:
Breaking all CompareGMs
Original issue's description:
> Add flipped gradient branch to two point conical gradient
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14235
R=bsalomon@google.com, mtklein@google.com
TBR=bsalomon@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/239993006
git-svn-id: http://skia.googlecode.com/svn/trunk@14236 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp')
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index 7cdb62dc44..d7b0384017 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -56,7 +56,6 @@ public: // The radial gradient parameters can collapse to a linear (instead of quadratic) equation. bool isDegenerate() const { return SkScalarAbs(fDiffRadius) == SkScalarAbs(fCenterX1); } - bool isFlipped() const { return fIsFlipped; } SkScalar center() const { return fCenterX1; } SkScalar diffRadius() const { return fDiffRadius; } SkScalar radius() const { return fRadius0; } @@ -69,8 +68,7 @@ private: return (INHERITED::onIsEqual(sBase) && this->fCenterX1 == s.fCenterX1 && this->fRadius0 == s.fRadius0 && - this->fDiffRadius == s.fDiffRadius && - this->fIsFlipped == s.fIsFlipped); + this->fDiffRadius == s.fDiffRadius); } Default2PtConicalEffect(GrContext* ctx, @@ -80,8 +78,7 @@ private: : INHERITED(ctx, shader, matrix, tm), fCenterX1(shader.getCenterX1()), fRadius0(shader.getStartRadius()), - fDiffRadius(shader.getDiffRadius()), - fIsFlipped(shader.isFlippedGrad()) { + 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(); @@ -106,7 +103,6 @@ private: SkScalar fCenterX1; SkScalar fRadius0; SkScalar fDiffRadius; - bool fIsFlipped; // @} @@ -136,7 +132,6 @@ protected: const char* fFSVaryingName; bool fIsDegenerate; - bool fIsFlipped; // @{ /// Values last uploaded as uniforms @@ -199,7 +194,6 @@ GLDefault2PtConicalEffect::GLDefault2PtConicalEffect(const GrBackendEffectFactor const Default2PtConicalEffect& data = drawEffect.castEffect<Default2PtConicalEffect>(); fIsDegenerate = data.isDegenerate(); - fIsFlipped = data.isFlipped(); } void GLDefault2PtConicalEffect::emitCode(GrGLShaderBuilder* builder, @@ -287,14 +281,9 @@ void GLDefault2PtConicalEffect::emitCode(GrGLShaderBuilder* builder, // Note: If there are two roots that both generate radius(t) > 0, the // Canvas spec says to choose the larger t. - // so we'll look at the larger one first (or smaller if flipped): - if (!fIsFlipped) { - builder->fsCodeAppendf("\t\tfloat %s = max(%s, %s);\n", tName.c_str(), - r0Name.c_str(), r1Name.c_str()); - } else { - builder->fsCodeAppendf("\t\tfloat %s = min(%s, %s);\n", tName.c_str(), - r0Name.c_str(), r1Name.c_str()); - } + // so we'll look at the larger one first: + builder->fsCodeAppendf("\t\tfloat %s = max(%s, %s);\n", tName.c_str(), + r0Name.c_str(), r1Name.c_str()); // if r(t) > 0, then we're done; t will be our x coordinate builder->fsCodeAppendf("\t\tif (%s * %s + %s > 0.0) {\n", tName.c_str(), @@ -305,13 +294,8 @@ void GLDefault2PtConicalEffect::emitCode(GrGLShaderBuilder* builder, // otherwise, if r(t) for the larger root was <= 0, try the other root builder->fsCodeAppend("\t\t} else {\n"); - if (!fIsFlipped) { - builder->fsCodeAppendf("\t\t\t%s = min(%s, %s);\n", tName.c_str(), - r0Name.c_str(), r1Name.c_str()); - } else { - builder->fsCodeAppendf("\t\t\t%s = max(%s, %s);\n", tName.c_str(), - r0Name.c_str(), r1Name.c_str()); - } + builder->fsCodeAppendf("\t\t\t%s = min(%s, %s);\n", tName.c_str(), + r0Name.c_str(), r1Name.c_str()); // if r(t) > 0 for the smaller root, then t will be our x coordinate builder->fsCodeAppendf("\t\t\tif (%s * %s + %s > 0.0) {\n", @@ -346,7 +330,6 @@ void GLDefault2PtConicalEffect::setData(const GrGLUniformManager& uman, INHERITED::setData(uman, drawEffect); const Default2PtConicalEffect& data = drawEffect.castEffect<Default2PtConicalEffect>(); SkASSERT(data.isDegenerate() == fIsDegenerate); - SkASSERT(data.isFlipped() == fIsFlipped); SkScalar centerX1 = data.center(); SkScalar radius0 = data.radius(); SkScalar diffRadius = data.diffRadius(); @@ -382,16 +365,12 @@ GrGLEffect::EffectKey GLDefault2PtConicalEffect::GenKey(const GrDrawEffect& draw const GrGLCaps&) { enum { kIsDegenerate = 1 << kBaseKeyBitCnt, - kIsFlipped = 1 << (kBaseKeyBitCnt + 1), }; EffectKey key = GenBaseGradientKey(drawEffect); if (drawEffect.castEffect<Default2PtConicalEffect>().isDegenerate()) { key |= kIsDegenerate; } - if (drawEffect.castEffect<Default2PtConicalEffect>().isFlipped()) { - key |= kIsFlipped; - } return key; } |