diff options
author | 2016-06-09 08:01:03 -0700 | |
---|---|---|
committer | 2016-06-09 08:01:03 -0700 | |
commit | 06ca8ec87cf6fab57cadd043a5ac18c4154a4129 (patch) | |
tree | 95e7eaaaf3f42ce550332277c431e3ec119446f4 /src/gpu/batches/GrAAFillRectBatch.cpp | |
parent | 897a8e38879643d81a64d2bb6bed4e22af982aa4 (diff) |
sk_sp for Ganesh.
Convert use of GrFragmentProcessor, GrGeometryProcessor, and
GrXPFactory to sk_sp. This clarifies ownership and should
reduce reference count churn by moving ownership.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041113004
Review-Url: https://codereview.chromium.org/2041113004
Diffstat (limited to 'src/gpu/batches/GrAAFillRectBatch.cpp')
-rw-r--r-- | src/gpu/batches/GrAAFillRectBatch.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp index 2c90b8bcf2..94cef02a1a 100644 --- a/src/gpu/batches/GrAAFillRectBatch.cpp +++ b/src/gpu/batches/GrAAFillRectBatch.cpp @@ -44,7 +44,7 @@ const GrBuffer* get_index_buffer(GrResourceProvider* resourceProvider) { gAAFillRectIndexBufferKey); } -static const GrGeometryProcessor* create_fill_rect_gp( +static sk_sp<GrGeometryProcessor> create_fill_rect_gp( const SkMatrix& viewMatrix, const GrXPOverridesForBatch& overrides, GrDefaultGeoProcFactory::LocalCoords::Type localCoordsType) { @@ -65,11 +65,11 @@ static const GrGeometryProcessor* create_fill_rect_gp( // We assume the caller has inverted the viewmatrix if (LocalCoords::kHasExplicit_Type == localCoordsType) { LocalCoords localCoords(localCoordsType); - return GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I()); + return GrDefaultGeoProcFactory::Make(color, coverage, localCoords, SkMatrix::I()); } else { LocalCoords localCoords(overrides.readsLocalCoords() ? localCoordsType : LocalCoords::kUnused_Type); - return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix); + return MakeForDeviceSpace(color, coverage, localCoords, viewMatrix); } } @@ -239,9 +239,9 @@ public: return !overrides.readsLocalCoords() || mine.fViewMatrix.cheapEqualTo(theirs.fViewMatrix); } - static const GrGeometryProcessor* CreateGP(const Geometry& geo, + static sk_sp<GrGeometryProcessor> MakeGP(const Geometry& geo, const GrXPOverridesForBatch& overrides) { - const GrGeometryProcessor* gp = + sk_sp<GrGeometryProcessor> gp = create_fill_rect_gp(geo.fViewMatrix, overrides, GrDefaultGeoProcFactory::LocalCoords::kUsePosition_Type); @@ -286,9 +286,9 @@ public: return true; } - static const GrGeometryProcessor* CreateGP(const Geometry& geo, + static sk_sp<GrGeometryProcessor> MakeGP(const Geometry& geo, const GrXPOverridesForBatch& overrides) { - const GrGeometryProcessor* gp = + sk_sp<GrGeometryProcessor> gp = create_fill_rect_gp(geo.fViewMatrix, overrides, GrDefaultGeoProcFactory::LocalCoords::kHasExplicit_Type); |