From fbde87f53d659ae2bd616751e466c887b0f3bee5 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 4 Mar 2014 16:25:34 +0000 Subject: Add GM that directly tests GrRRectEffect and add inverse fill version of effect. BUG=skia: R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/176843016 git-svn-id: http://skia.googlecode.com/svn/trunk@13653 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrClipMaskManager.cpp | 2 +- src/gpu/effects/GrRRectEffect.cpp | 86 ++++++++++++++++++++++----------------- src/gpu/effects/GrRRectEffect.h | 11 ++++- 3 files changed, 60 insertions(+), 39 deletions(-) (limited to 'src/gpu') diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index 90106fa7e0..9b95d33c5a 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -192,7 +192,7 @@ bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn, } } else if (isAA && SkClipStack::Element::kRRect_Type == type && !rt->isMultisampled()) { const SkRRect& rrect = elements.tail()->getRRect(); - effect.reset(GrRRectEffect::Create(rrect)); + effect.reset(GrRRectEffect::Create(GrRRectEffect::kFillAA_EdgeType, rrect)); } else if (isAA && SkClipStack::Element::kRect_Type == type && !rt->isMultisampled()) { // We only handle AA/non-MSAA rects here. Coverage effect AA isn't MSAA friendly and // non-AA rect clips are handled by the scissor. diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 7a6554b88f..583e385869 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -13,30 +13,34 @@ #include "SkRRect.h" +using namespace GrRRectEffect; + class GLRRectEffect; class RRectEffect : public GrEffect { public: // This effect only supports circular corner rrects where the radius is >= kRadiusMin. static const SkScalar kRadiusMin; - + /// The types of circular corner rrects supported - enum Type { - kCircleCorner_Type, //::getInstance(); } -RRectEffect::RRectEffect(const SkRRect& rrect, Type type) +RRectEffect::RRectEffect(EdgeType edgeType, const SkRRect& rrect, RRectType rrtype) : fRRect(rrect) - , fType(type) { + , fEdgeType(edgeType) + , fRRectType(rrtype) { this->setWillReadFragmentPosition(); } bool RRectEffect::onIsEqual(const GrEffect& other) const { const RRectEffect& rre = CastEffect(other); // type is derived from fRRect, so no need to check it. - return fRRect == rre.fRRect; + return fEdgeType == rre.fEdgeType && fRRect == rre.fRRect; } ////////////////////////////////////////////////////////////////////////////// @@ -94,10 +100,11 @@ GrEffectRef* RRectEffect::TestCreate(SkRandom* random, SkScalar w = random->nextRangeScalar(20.f, 1000.f); SkScalar h = random->nextRangeScalar(20.f, 1000.f); SkScalar r = random->nextRangeF(kRadiusMin, 9.f); + EdgeType et = (EdgeType) random->nextULessThan(kEdgeTypeCnt); SkRRect rrect; rrect.setRectXY(SkRect::MakeWH(w, h), r, r); - return GrRRectEffect::Create(rrect); + return GrRRectEffect::Create(et, rrect); } ////////////////////////////////////////////////////////////////////////////// @@ -170,14 +177,14 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, // computations, compute a separate rect edge alpha for the rect side, and mul the two computed // alphas together. switch (rre.getType()) { - case RRectEffect::kCircleCorner_Type: + case RRectEffect::kCircleCorner_RRectType: builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos); builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName); builder->fsCodeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n"); builder->fsCodeAppendf("\t\tfloat alpha = clamp(%s - length(dxy), 0.0, 1.0);\n", radiusPlusHalfName); break; - case RRectEffect::kLeftCircleTab_Type: + case RRectEffect::kLeftCircleTab_RRectType: builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos); builder->fsCodeAppendf("\t\tfloat dy1 = %s.y - %s.w;\n", fragmentPos, rectName); builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(dxy0.x, max(dxy0.y, dy1)), 0.0);\n"); @@ -186,7 +193,7 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, builder->fsCodeAppendf("\t\tfloat alpha = rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n", radiusPlusHalfName); break; - case RRectEffect::kTopCircleTab_Type: + case RRectEffect::kTopCircleTab_RRectType: builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos); builder->fsCodeAppendf("\t\tfloat dx1 = %s.x - %s.z;\n", fragmentPos, rectName); builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(max(dxy0.x, dx1), dxy0.y), 0.0);\n"); @@ -195,7 +202,7 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, builder->fsCodeAppendf("\t\tfloat alpha = bottomAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n", radiusPlusHalfName); break; - case RRectEffect::kRightCircleTab_Type: + case RRectEffect::kRightCircleTab_RRectType: builder->fsCodeAppendf("\t\tfloat dy0 = %s.y - %s.y;\n", rectName, fragmentPos); builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName); builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(dxy1.x, max(dy0, dxy1.y)), 0.0);\n"); @@ -204,7 +211,7 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, builder->fsCodeAppendf("\t\tfloat alpha = leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n", radiusPlusHalfName); break; - case RRectEffect::kBottomCircleTab_Type: + case RRectEffect::kBottomCircleTab_RRectType: builder->fsCodeAppendf("\t\tfloat dx0 = %s.x - %s.x;\n", rectName, fragmentPos); builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName); builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(max(dx0, dxy1.x), dxy1.y), 0.0);\n"); @@ -214,6 +221,10 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, radiusPlusHalfName); break; } + + if (kInverseFillAA_EdgeType == rre.getEdgeType()) { + builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n"); + } builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str()); @@ -221,7 +232,8 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder, GrGLEffect::EffectKey GLRRectEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) { const RRectEffect& rre = drawEffect.castEffect(); - return rre.getType(); + GR_STATIC_ASSERT(kEdgeTypeCnt <= 4); + return (rre.getType() << 2) | rre.getEdgeType(); } void GLRRectEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { @@ -231,34 +243,34 @@ void GLRRectEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& SkRect rect = rrect.getBounds(); SkScalar radius = 0; switch (rre.getType()) { - case RRectEffect::kCircleCorner_Type: + case RRectEffect::kCircleCorner_RRectType: SkASSERT(rrect.isSimpleCircular()); radius = rrect.getSimpleRadii().fX; SkASSERT(radius >= RRectEffect::kRadiusMin); rect.inset(radius, radius); break; - case RRectEffect::kLeftCircleTab_Type: + case RRectEffect::kLeftCircleTab_RRectType: radius = rrect.radii(SkRRect::kUpperLeft_Corner).fX; rect.fLeft += radius; rect.fTop += radius; rect.fRight += 0.5f; rect.fBottom -= radius; break; - case RRectEffect::kTopCircleTab_Type: + case RRectEffect::kTopCircleTab_RRectType: radius = rrect.radii(SkRRect::kUpperLeft_Corner).fX; rect.fLeft += radius; rect.fTop += radius; rect.fRight -= radius; rect.fBottom += 0.5f; break; - case RRectEffect::kRightCircleTab_Type: + case RRectEffect::kRightCircleTab_RRectType: radius = rrect.radii(SkRRect::kUpperRight_Corner).fX; rect.fLeft -= 0.5f; rect.fTop += radius; rect.fRight -= radius; rect.fBottom -= radius; break; - case RRectEffect::kBottomCircleTab_Type: + case RRectEffect::kBottomCircleTab_RRectType: radius = rrect.radii(SkRRect::kLowerLeft_Corner).fX; rect.fLeft += radius; rect.fTop -= 0.5f; @@ -274,13 +286,13 @@ void GLRRectEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& ////////////////////////////////////////////////////////////////////////////// -GrEffectRef* GrRRectEffect::Create(const SkRRect& rrect) { - RRectEffect::Type type; +GrEffectRef* GrRRectEffect::Create(EdgeType edgeType, const SkRRect& rrect) { + RRectEffect::RRectType rrtype; if (rrect.isSimpleCircular()) { if (rrect.getSimpleRadii().fX < RRectEffect::kRadiusMin) { return NULL; } - type = RRectEffect::kCircleCorner_Type; + rrtype = RRectEffect::kCircleCorner_RRectType; } else if (rrect.isComplex()) { // Check for the "tab" cases - two adjacent circular corners and two square corners. SkScalar radius = 0; @@ -314,16 +326,16 @@ GrEffectRef* GrRRectEffect::Create(const SkRRect& rrect) { GR_STATIC_ASSERT(SkRRect::kLowerLeft_Corner == 3); switch (circleCornerBitfield) { case 3: - type = RRectEffect::kTopCircleTab_Type; + rrtype = RRectEffect::kTopCircleTab_RRectType; break; case 6: - type = RRectEffect::kRightCircleTab_Type; + rrtype = RRectEffect::kRightCircleTab_RRectType; break; case 9: - type = RRectEffect::kLeftCircleTab_Type; + rrtype = RRectEffect::kLeftCircleTab_RRectType; break; case 12: - type = RRectEffect::kBottomCircleTab_Type; + rrtype = RRectEffect::kBottomCircleTab_RRectType; break; default: return NULL; @@ -331,5 +343,5 @@ GrEffectRef* GrRRectEffect::Create(const SkRRect& rrect) { } else { return NULL; } - return RRectEffect::Create(rrect, type); + return RRectEffect::Create(edgeType, rrect, rrtype); } diff --git a/src/gpu/effects/GrRRectEffect.h b/src/gpu/effects/GrRRectEffect.h index 45dac0154f..7df7e6f076 100644 --- a/src/gpu/effects/GrRRectEffect.h +++ b/src/gpu/effects/GrRRectEffect.h @@ -14,11 +14,20 @@ class GrEffectRef; class SkRRect; namespace GrRRectEffect { + enum EdgeType { + kFillAA_EdgeType, + kInverseFillAA_EdgeType, + + kLastEdgeType = kInverseFillAA_EdgeType, + }; + + static const int kEdgeTypeCnt = kLastEdgeType + 1; + /** * Creates an effect that performs anti-aliased clipping against a SkRRect. It doesn't support * all varieties of SkRRect so the caller must check for a NULL return. */ - GrEffectRef* Create(const SkRRect&); + GrEffectRef* Create(EdgeType, const SkRRect&); }; #endif -- cgit v1.2.3