diff options
| author |  bungeman <bungeman@google.com> | 2016-06-09 08:01:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-09 08:01:03 -0700 |
| commit | 06ca8ec87cf6fab57cadd043a5ac18c4154a4129 (patch) | |
| tree | 95e7eaaaf3f42ce550332277c431e3ec119446f4 /src/gpu/effects/GrBitmapTextGeoProc.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/effects/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 246d7be627..633a8806ef 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -164,7 +164,7 @@ GrGLSLPrimitiveProcessor* GrBitmapTextGeoProc::createGLSLInstance(const GrGLSLCa GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrBitmapTextGeoProc); -const GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* d) { +sk_sp<GrGeometryProcessor> GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* d) { int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : GrProcessorUnitTest::kAlphaTextureIdx; static const SkShader::TileMode kTileModes[] = { @@ -177,7 +177,7 @@ const GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))], }; GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams::kBilerp_FilterMode : - GrTextureParams::kNone_FilterMode); + GrTextureParams::kNone_FilterMode); GrMaskFormat format = kARGB_GrMaskFormat; // init to avoid warning switch (d->fRandom->nextULessThan(3)) { @@ -192,7 +192,7 @@ const GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* break; } - return GrBitmapTextGeoProc::Create(GrRandomColor(d->fRandom), d->fTextures[texIdx], params, - format, GrTest::TestMatrix(d->fRandom), - d->fRandom->nextBool()); + return GrBitmapTextGeoProc::Make(GrRandomColor(d->fRandom), d->fTextures[texIdx], params, + format, GrTest::TestMatrix(d->fRandom), + d->fRandom->nextBool()); } |