| Index: gm/rrects.cpp
|
| diff --git a/gm/rrects.cpp b/gm/rrects.cpp
|
| index e104aea4335259769f08d5f90c871f91ba9f9443..0f3ac56fec59c2f38e36467f787190459935cb09 100644
|
| --- a/gm/rrects.cpp
|
| +++ b/gm/rrects.cpp
|
| @@ -101,16 +101,15 @@ protected:
|
| canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
|
| if (kEffect_Type == fType) {
|
| #if SK_SUPPORT_GPU
|
| - GrPipelineBuilder pipelineBuilder;
|
| - pipelineBuilder.setXPFactory(
|
| - GrPorterDuffXPFactory::Make(SkXfermode::kSrc_Mode));
|
| + GrPaint grPaint;
|
| + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkXfermode::kSrc_Mode));
|
|
|
| SkRRect rrect = fRRects[curRRect];
|
| rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
|
| GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
|
| sk_sp<GrFragmentProcessor> fp(GrRRectEffect::Make(edgeType, rrect));
|
| if (fp) {
|
| - pipelineBuilder.addCoverageFragmentProcessor(std::move(fp));
|
| + grPaint.addCoverageFragmentProcessor(std::move(fp));
|
|
|
| SkRect bounds = rrect.getBounds();
|
| bounds.outset(2.f, 2.f);
|
| @@ -118,8 +117,7 @@ protected:
|
| SkAutoTUnref<GrDrawBatch> batch(
|
| GrRectBatchFactory::CreateNonAAFill(0xff000000, SkMatrix::I(),
|
| bounds, nullptr, nullptr));
|
| - drawContext->drawContextPriv().testingOnly_drawBatch(pipelineBuilder,
|
| - batch);
|
| + drawContext->drawContextPriv().testingOnly_drawBatch(grPaint, batch);
|
| } else {
|
| drew = false;
|
| }
|
|
|