diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-09 16:00:33 +0000 |
|---|---|---|
| committer | Brian Salomon <bsalomon@google.com> | 2017-01-09 16:08:13 +0000 |
| commit | 003312a211e65f35e402d6fe80a32e23d4c94ac4 (patch) | |
| tree | 61635d3df8e7bf873c0ea08b211da03521b8a477 /gm | |
| parent | a8f80de2bc17672b4b6f26d3cf6b38123ac850c9 (diff) | |
Revert "Removing ref counting from GrXPFactory."
This reverts commit a8f80de2bc17672b4b6f26d3cf6b38123ac850c9.
Reason for revert: nanobench failing on windows bots, possibly others
Change-Id: Iacb8c650064a28654c165665be057377ffb02ba5
Reviewed-on: https://skia-review.googlesource.com/6802
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 6 | ||||
| -rw-r--r-- | gm/bigrrectaaeffect.cpp | 2 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 4 | ||||
| -rw-r--r-- | gm/rrects.cpp | 2 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 2 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index bcce9dbafb..07fc977882 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -193,7 +193,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); std::unique_ptr<GrDrawOp> op = BezierCubicOrConicTestOp::Make(gp, bounds, color, klmEqs, klmSigns[c]); @@ -326,7 +326,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); std::unique_ptr<GrDrawOp> op = BezierCubicOrConicTestOp::Make(gp, bounds, color, klmEqs, 1.f); @@ -540,7 +540,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); GrPathUtils::QuadUVMatrix DevToUV(pts); diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index d8034a4384..21e49ebbc9 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -75,7 +75,7 @@ protected: canvas->drawRect(testBounds, paint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); SkRRect rrect = fRRect; rrect.offset(SkIntToScalar(x + kGap), SkIntToScalar(y + kGap)); diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 5927d5d0c7..db0b02e6b3 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -180,7 +180,7 @@ protected: } GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); grPaint.addCoverageFragmentProcessor(std::move(fp)); std::unique_ptr<GrDrawOp> op = PolyBoundsOp::Make(p.getBounds(), 0xff000000); @@ -220,7 +220,7 @@ protected: } GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); grPaint.addCoverageFragmentProcessor(std::move(fp)); std::unique_ptr<GrDrawOp> op = PolyBoundsOp::Make(rect, 0xff000000); diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 33de77f11d..a0518018e7 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -103,7 +103,7 @@ protected: if (kEffect_Type == fType) { #if SK_SUPPORT_GPU GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); SkRRect rrect = fRRects[curRRect]; rrect.offset(SkIntToScalar(x), SkIntToScalar(y)); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index f2c5fd4652..9ff694d281 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -113,7 +113,7 @@ protected: for (int m = 0; m < GrTextureDomain::kModeCount; ++m) { GrTextureDomain::Mode mode = (GrTextureDomain::Mode) m; GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrTextureDomainEffect::Make(texture.get(), nullptr, textureMatrices[tm], GrTextureDomain::MakeTexelDomain(texture.get(), diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 103c2e41ff..ab04a9d87b 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -111,7 +111,7 @@ protected: for (int i = 0; i < 6; ++i) { GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrYUVEffect::MakeYUVToRGB(texture[indices[i][0]].get(), texture[indices[i][1]].get(), @@ -228,7 +228,7 @@ protected: SkScalar x = kDrawPad + kTestPad; GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrYUVEffect::MakeYUVToRGB(texture[0].get(), texture[1].get(), texture[2].get(), sizes, static_cast<SkYUVColorSpace>(space), true)); |