diff options
| author |  cdalton <cdalton@nvidia.com> | 2016-05-12 15:09:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 15:09:48 -0700 |
| commit | 862cff30eaa16206d76d7de7594c9167375ca87e (patch) | |
| tree | b8f177f4d401b8c0361141ce834eaa9898d7beb4 /tests | |
| parent | 193d9cf8f2280cd4f8e509c6f3af6b47cea04935 (diff) | |
Remove clip from GrPipelineBuilder
This eliminates a copy and will allow us to make the GrClip class
virutal.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1966903004
Review-Url: https://codereview.chromium.org/1966903004
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 5 | ||||
| -rw-r--r-- | tests/TessellatingPathRendererTests.cpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 2606c3ffcd..a59cffa50a 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -331,9 +331,6 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { // dummy scissor state GrScissorState scissor; - // wide open clip - GrClip clip; - SkRandom random; static const int NUM_TESTS = 1024; for (int t = 0; t < NUM_TESTS; t++) { @@ -347,7 +344,6 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { GrPipelineBuilder pipelineBuilder; pipelineBuilder.setRenderTarget(rt.get()); - pipelineBuilder.setClip(clip); SkAutoTUnref<GrDrawBatch> batch(GrRandomDrawBatch(&random, context)); SkASSERT(batch); @@ -387,7 +383,6 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { GrPipelineBuilder builder; builder.setXPFactory(GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref(); builder.setRenderTarget(rt.get()); - builder.setClip(clip); SkAutoTUnref<const GrFragmentProcessor> fp( GrProcessorTestFactory<GrFragmentProcessor>::CreateIdx(i, &ptd)); diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp index 932eb5e676..62ad6e2c64 100644 --- a/tests/TessellatingPathRendererTests.cpp +++ b/tests/TessellatingPathRendererTests.cpp @@ -243,6 +243,7 @@ static void test_path(GrDrawTarget* dt, GrRenderTarget* rt, GrResourceProvider* GrPathRenderer::DrawPathArgs args; args.fTarget = dt; args.fPipelineBuilder = &pipelineBuilder; + args.fClip = &GrClip::WideOpen(); args.fResourceProvider = rp; args.fColor = GrColor_WHITE; args.fViewMatrix = &SkMatrix::I(); |