diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-07 19:43:43 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-07 19:43:43 +0000 |
| commit | e5a041c0688ccb861cc85f8917338602864d8e5a (patch) | |
| tree | a6d19f9f4643284ec9ef9808e4a3a6736f12c4e4 /src/gpu/effects/GrRRectEffect.cpp | |
| parent | 8c2ee5963505cdbe128f68d67f064a3901d22a3c (diff) | |
Implement the clip as 4 or fewer GrEffects when possible.
BUG=skia:2181
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/188693008
git-svn-id: http://skia.googlecode.com/svn/trunk@13710 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects/GrRRectEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrRRectEffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 5b755b350f..bc6abea547 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -67,7 +67,7 @@ const SkScalar RRectEffect::kRadiusMin = 0.5f; GrEffectRef* RRectEffect::Create(GrEffectEdgeType edgeType, RRectType rrType, const SkRRect& rrect) { - SkASSERT(kFillAA_GrEffectEdgeType == edgeType || kInverseFillBW_GrEffectEdgeType == edgeType); + SkASSERT(kFillAA_GrEffectEdgeType == edgeType || kInverseFillAA_GrEffectEdgeType == edgeType); return CreateEffectRef(AutoEffectUnref(SkNEW_ARGS(RRectEffect, (edgeType, rrType, rrect)))); } @@ -228,7 +228,7 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, break; } - if (kInverseFillBW_GrEffectEdgeType == rre.getEdgeType()) { + if (kInverseFillAA_GrEffectEdgeType == rre.getEdgeType()) { builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n"); } @@ -293,7 +293,7 @@ void GLRRectEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& ////////////////////////////////////////////////////////////////////////////// GrEffectRef* GrRRectEffect::Create(GrEffectEdgeType edgeType, const SkRRect& rrect) { - if (kFillAA_GrEffectEdgeType != edgeType && kInverseFillBW_GrEffectEdgeType != edgeType) { + if (kFillAA_GrEffectEdgeType != edgeType && kInverseFillAA_GrEffectEdgeType != edgeType) { return NULL; } RRectEffect::RRectType rrtype; |