diff options
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 7 | ||||
-rw-r--r-- | src/gpu/effects/GrShadowGeoProc.cpp | 2 | ||||
-rw-r--r-- | src/gpu/ops/GrShadowRRectOp.cpp | 75 | ||||
-rw-r--r-- | src/gpu/ops/GrShadowRRectOp.h | 2 |
4 files changed, 37 insertions, 49 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index cdb25fb533..6feb345ffa 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -1024,15 +1024,10 @@ bool GrRenderTargetContext::drawFastShadow(const GrClip& clip, // set a large inset to force a fill devSpaceInsetWidth = ambientRRect.width(); } - // the fraction of the blur we want to apply is devSpaceInsetWidth/devSpaceAmbientBlur, - // which is just 1/umbraRecipAlpha. - SkScalar blurClamp = SkScalarInvert(umbraRecipAlpha); - std::unique_ptr<GrDrawOp> op = GrShadowRRectOp::Make(ambientColor, viewMatrix, ambientRRect, devSpaceAmbientBlur, - devSpaceInsetWidth, - blurClamp); + devSpaceInsetWidth); SkASSERT(op); this->addDrawOp(clip, std::move(op)); } diff --git a/src/gpu/effects/GrShadowGeoProc.cpp b/src/gpu/effects/GrShadowGeoProc.cpp index 7eddaa41d8..9f84aa2ae7 100644 --- a/src/gpu/effects/GrShadowGeoProc.cpp +++ b/src/gpu/effects/GrShadowGeoProc.cpp @@ -45,7 +45,7 @@ public: fragBuilder->codeAppend("half d = length(shadowParams.xy);"); fragBuilder->codeAppend("half distance = shadowParams.z * (1.0 - d);"); - fragBuilder->codeAppend("half factor = 1.0 - clamp(distance, 0.0, shadowParams.w);"); + fragBuilder->codeAppend("half factor = 1.0 - clamp(distance, 0.0, 1.0);"); fragBuilder->codeAppend("factor = exp(-factor * factor * 4.0) - 0.018;"); fragBuilder->codeAppendf("%s = half4(factor);", args.fOutputCoverage); diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp index ba96941073..bee4e2d235 100644 --- a/src/gpu/ops/GrShadowRRectOp.cpp +++ b/src/gpu/ops/GrShadowRRectOp.cpp @@ -188,8 +188,7 @@ public: // An insetWidth > 1/2 rect width or height indicates a simple fill. ShadowCircularRRectOp(GrColor color, const SkRect& devRect, - float devRadius, bool isCircle, float blurRadius, float insetWidth, - float blurClamp) + float devRadius, bool isCircle, float blurRadius, float insetWidth) : INHERITED(ClassID()) { SkRect bounds = devRect; SkASSERT(insetWidth > 0); @@ -225,7 +224,7 @@ public: this->setBounds(bounds, HasAABloat::kNo, IsZeroArea::kNo); fGeoData.emplace_back(Geometry{color, outerRadius, umbraInset, innerRadius, - blurRadius, blurClamp, bounds, type, isCircle}); + blurRadius, bounds, type, isCircle}); if (isCircle) { fVertCount = circle_type_to_vert_count(kStroke_RRectType == type); fIndexCount = circle_type_to_index_count(kStroke_RRectType == type); @@ -266,7 +265,6 @@ private: SkScalar fUmbraInset; SkScalar fInnerRadius; SkScalar fBlurRadius; - SkScalar fClampValue; SkRect fDevBounds; RRectType fType; bool fIsCircle; @@ -277,7 +275,7 @@ private: GrColor fColor; SkPoint fOffset; SkScalar fDistanceCorrection; - SkScalar fClampValue; + SkScalar fPad; // to be used later }; void fillInCircleVerts(const Geometry& args, bool isStroked, CircleVertex** verts) const { @@ -287,7 +285,6 @@ private: SkScalar innerRadius = args.fInnerRadius; SkScalar blurRadius = args.fBlurRadius; SkScalar distanceCorrection = outerRadius / blurRadius; - SkScalar clampValue = args.fClampValue; const SkRect& bounds = args.fDevBounds; @@ -302,56 +299,56 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-octOffset, -1); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(octOffset * halfWidth, -halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(octOffset, -1); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(halfWidth, -octOffset * halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(1, -octOffset); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(halfWidth, octOffset * halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(1, octOffset); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(octOffset * halfWidth, halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(octOffset, 1); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(-octOffset * halfWidth, halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-octOffset, 1); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(-halfWidth, octOffset * halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-1, octOffset); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(-halfWidth, -octOffset * halfWidth); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-1, -octOffset); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; if (isStroked) { @@ -366,56 +363,56 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-s * innerRadius, -c * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(s * r, -c * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(s * innerRadius, -c * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(c * r, -s * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(c * innerRadius, -s * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(c * r, s * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(c * innerRadius, s * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(s * r, c * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(s * innerRadius, c * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(-s * r, c * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-s * innerRadius, c * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(-c * r, s * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-c * innerRadius, s * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = center + SkPoint::Make(-c * r, -s * r); (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(-c * innerRadius, -s * innerRadius); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; } else { // filled @@ -423,7 +420,7 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(0, 0); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; } } @@ -466,7 +463,6 @@ private: outerVec.fX + outerVec.fY); diagVec *= umbraInset / (2 * umbraInset - outerRadius); SkScalar distanceCorrection = umbraInset / blurRadius; - SkScalar clampValue = args.fClampValue; // build corner by corner for (int i = 0; i < 4; ++i) { @@ -475,7 +471,7 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkVector::Make(0, 0); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; // outer points @@ -483,35 +479,35 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkVector::Make(0, -1); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = SkPoint::Make(xOuter[i], yMid[i]); (*verts)->fColor = color; (*verts)->fOffset = outerVec; (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = SkPoint::Make(xOuter[i], yOuter[i]); (*verts)->fColor = color; (*verts)->fOffset = diagVec; (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = SkPoint::Make(xMid[i], yOuter[i]); (*verts)->fColor = color; (*verts)->fOffset = outerVec; (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; (*verts)->fPos = SkPoint::Make(xInner[i], yOuter[i]); (*verts)->fColor = color; (*verts)->fOffset = SkVector::Make(0, -1); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; } @@ -529,7 +525,7 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(0, 0); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; // TR @@ -537,7 +533,7 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(0, 0); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; // BL @@ -545,7 +541,7 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(0, 0); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; // BR @@ -553,7 +549,7 @@ private: (*verts)->fColor = color; (*verts)->fOffset = SkPoint::Make(0, 0); (*verts)->fDistanceCorrection = distanceCorrection; - (*verts)->fClampValue = clampValue; + (*verts)->fPad = 0; (*verts)++; } @@ -648,8 +644,7 @@ std::unique_ptr<GrDrawOp> Make(GrColor color, const SkMatrix& viewMatrix, const SkRRect& rrect, SkScalar blurWidth, - SkScalar insetWidth, - SkScalar blurClamp) { + SkScalar insetWidth) { // Shadow rrect ops only handle simple circular rrects. SkASSERT(viewMatrix.isSimilarity() && SkRRectPriv::EqualRadii(rrect)); @@ -668,8 +663,7 @@ std::unique_ptr<GrDrawOp> Make(GrColor color, scaledRadius, rrect.isOval(), blurWidth, - scaledInsetWidth, - blurClamp)); + scaledInsetWidth)); } } @@ -689,21 +683,20 @@ GR_DRAW_OP_TEST_DEFINE(ShadowRRectOp) { viewMatrix.postScale(scale, scale); SkScalar insetWidth = random->nextSScalar1() * 72.f; SkScalar blurWidth = random->nextSScalar1() * 72.f; - SkScalar blurClamp = random->nextSScalar1(); bool isCircle = random->nextBool(); // This op doesn't use a full GrPaint, just a color. GrColor color = paint.getColor(); if (isCircle) { SkRect circle = GrTest::TestSquare(random); SkRRect rrect = SkRRect::MakeOval(circle); - return GrShadowRRectOp::Make(color, viewMatrix, rrect, blurWidth, insetWidth, blurClamp); + return GrShadowRRectOp::Make(color, viewMatrix, rrect, blurWidth, insetWidth); } else { SkRRect rrect; do { // This may return a rrect with elliptical corners, which we don't support. rrect = GrTest::TestRRectSimple(random); } while (!SkRRectPriv::IsSimpleCircular(rrect)); - return GrShadowRRectOp::Make(color, viewMatrix, rrect, blurWidth, insetWidth, blurClamp); + return GrShadowRRectOp::Make(color, viewMatrix, rrect, blurWidth, insetWidth); } } diff --git a/src/gpu/ops/GrShadowRRectOp.h b/src/gpu/ops/GrShadowRRectOp.h index 3d8e92af00..5ff084e3c8 100644 --- a/src/gpu/ops/GrShadowRRectOp.h +++ b/src/gpu/ops/GrShadowRRectOp.h @@ -19,7 +19,7 @@ class SkStrokeRec; namespace GrShadowRRectOp { std::unique_ptr<GrDrawOp> Make(GrColor, const SkMatrix& viewMatrix, const SkRRect& rrect, - SkScalar blurWidth, SkScalar insetWidth, SkScalar blurClamp = 1); + SkScalar blurWidth, SkScalar insetWidth); } #endif |