diff options
| author |  robertphillips <robertphillips@google.com> | 2016-06-06 06:16:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-06 06:16:21 -0700 |
| commit | 55fdcccf01d49173bc731024b4283d3a3ea9150a (patch) | |
| tree | 1980bd38220c48296bc0d3a9683314e8152c2347 /gm | |
| parent | 401e77cfe126eea1a12bd81410871fdb80739283 (diff) | |
Remove GrRenderTarget from GrPipelineBuilder
This used to be "Declassify GrClipMaskManager and Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder"
but has been split into:
https://codereview.chromium.org/1993263002/ (Make GrAppliedClip friendless)
https://codereview.chromium.org/1997773002/ (Retract GrRenderTarget from GLProgramsTest)
https://codereview.chromium.org/1993403002/ (GrSWMaskHelper and GrSoftwarePathRenderer only need the textureProvider (not GrContext))
https://codereview.chromium.org/2004433002/ (Retract GrRenderTarget from GrTestTarget)
https://codereview.chromium.org/2015333002/ (Change parameters to GrPipelineBuilder's ctor)
https://codereview.chromium.org/2035823002/ (Make GrClipMaskManager stateless and push GrPipelineBuilder construction downstack)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1988923002
Review-Url: https://codereview.chromium.org/1988923002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 3 | ||||
| -rw-r--r-- | gm/bigrrectaaeffect.cpp | 1 | ||||
| -rw-r--r-- | gm/constcolorprocessor.cpp | 1 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 2 | ||||
| -rw-r--r-- | gm/rrects.cpp | 1 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 1 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 1 |
7 files changed, 0 insertions, 10 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index cfb84a5bcc..1224c1a8bb 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -192,7 +192,6 @@ protected: GrPipelineBuilder pipelineBuilder; pipelineBuilder.setXPFactory( GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); SkAutoTUnref<GrDrawBatch> batch( new BezierCubicOrConicTestBatch(gp, bounds, color, klmEqs, klmSigns[c])); @@ -325,7 +324,6 @@ protected: GrPipelineBuilder pipelineBuilder; pipelineBuilder.setXPFactory( GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); SkAutoTUnref<GrDrawBatch> batch( new BezierCubicOrConicTestBatch(gp, bounds, color, klmEqs, 1.f)); @@ -533,7 +531,6 @@ protected: GrPipelineBuilder pipelineBuilder; pipelineBuilder.setXPFactory( GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); GrPathUtils::QuadUVMatrix DevToUV(pts); diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index b3f39a0f2d..1036ed0dab 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -84,7 +84,6 @@ protected: SkASSERT(fp); if (fp) { pipelineBuilder.addCoverageFragmentProcessor(fp); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); SkRect bounds = testBounds; bounds.offset(SkIntToScalar(x), SkIntToScalar(y)); diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index da7aa38838..57f17b2975 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -109,7 +109,6 @@ protected: GrPipelineBuilder pipelineBuilder(grPaint, drawContext->isUnifiedMultisampled()); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); pipelineBuilder.addColorFragmentProcessor(fp); SkAutoTUnref<GrDrawBatch> batch( diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 5b278020f6..13659476ba 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -182,7 +182,6 @@ protected: pipelineBuilder.setXPFactory( GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); pipelineBuilder.addCoverageFragmentProcessor(fp); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); SkAutoTUnref<GrDrawBatch> batch(new PolyBoundsBatch(p.getBounds(), 0xff000000)); @@ -223,7 +222,6 @@ protected: pipelineBuilder.setXPFactory( GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); pipelineBuilder.addCoverageFragmentProcessor(fp); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); SkAutoTUnref<GrDrawBatch> batch(new PolyBoundsBatch(rect, 0xff000000)); diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 9f1c65d7e7..5f28c9e4a2 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -112,7 +112,6 @@ protected: rrect)); if (fp) { pipelineBuilder.addCoverageFragmentProcessor(fp); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); SkRect bounds = rrect.getBounds(); bounds.outset(2.f, 2.f); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 6607488731..588ce97437 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -124,7 +124,6 @@ protected: continue; } const SkMatrix viewMatrix = SkMatrix::MakeTrans(x, y); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); pipelineBuilder.addColorFragmentProcessor(fp); SkAutoTUnref<GrDrawBatch> batch( diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 40a2f03f27..57e4f46bbc 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -122,7 +122,6 @@ protected: if (fp) { SkMatrix viewMatrix; viewMatrix.setTranslate(x, y); - pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget()); pipelineBuilder.addColorFragmentProcessor(fp); SkAutoTUnref<GrDrawBatch> batch( GrRectBatchFactory::CreateNonAAFill(GrColor_WHITE, viewMatrix, |