aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/TessellatingPathRendererTests.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-05-20 11:14:33 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-20 11:14:33 -0700
commit87f15c8ff11ad2bfb0c6711d7837020a50fe7fb8 (patch)
treefc3899058560ca294ba062de98c3246db3c225d2 /tests/TessellatingPathRendererTests.cpp
parentf2c96a2a6fa22c674083db701d15702636f9d5fc (diff)
Retract GrRenderTarget from GrTestTarget
Split out of: https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder) GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=2004433002 Review-Url: https://codereview.chromium.org/2004433002
Diffstat (limited to 'tests/TessellatingPathRendererTests.cpp')
-rw-r--r--tests/TessellatingPathRendererTests.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index a3eb4893d3..22779c2fca 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -232,13 +232,13 @@ static SkPath create_path_15() {
return path;
}
-static void test_path(GrDrawTarget* dt, GrRenderTarget* rt, GrResourceProvider* rp,
- const SkPath& path) {
+static void test_path(GrDrawTarget* dt, GrDrawContext* drawContext,
+ GrResourceProvider* rp, const SkPath& path) {
GrTessellatingPathRenderer tess;
GrPipelineBuilder pipelineBuilder;
pipelineBuilder.setXPFactory(
GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref();
- pipelineBuilder.setRenderTarget(rt);
+ pipelineBuilder.setRenderTarget(drawContext->accessRenderTarget());
GrNoClip noClip;
GrStyle style(SkStrokeRec::kFill_InitStyle);
GrPathRenderer::DrawPathArgs args;
@@ -255,35 +255,35 @@ static void test_path(GrDrawTarget* dt, GrRenderTarget* rt, GrResourceProvider*
}
DEF_GPUTEST_FOR_ALL_CONTEXTS(TessellatingPathRendererTests, reporter, ctxInfo) {
- GrSurfaceDesc desc;
- desc.fFlags = kRenderTarget_GrSurfaceFlag;
- desc.fWidth = 800;
- desc.fHeight = 800;
- desc.fConfig = kSkia8888_GrPixelConfig;
- desc.fOrigin = kTopLeft_GrSurfaceOrigin;
- SkAutoTUnref<GrTexture> texture(
- ctxInfo.grContext()->textureProvider()->createApproxTexture(desc));
+ sk_sp<GrDrawContext> drawContext(ctxInfo.grContext()->newDrawContext(SkBackingFit::kApprox,
+ 800, 800,
+ kSkia8888_GrPixelConfig,
+ 0,
+ kTopLeft_GrSurfaceOrigin));
+ if (!drawContext) {
+ return;
+ }
+
GrTestTarget tt;
- GrRenderTarget* rt = texture->asRenderTarget();
- ctxInfo.grContext()->getTestTarget(&tt, rt);
+ ctxInfo.grContext()->getTestTarget(&tt, drawContext);
GrDrawTarget* dt = tt.target();
GrResourceProvider* rp = tt.resourceProvider();
- test_path(dt, rt, rp, create_path_0());
- test_path(dt, rt, rp, create_path_1());
- test_path(dt, rt, rp, create_path_2());
- test_path(dt, rt, rp, create_path_3());
- test_path(dt, rt, rp, create_path_4());
- test_path(dt, rt, rp, create_path_5());
- test_path(dt, rt, rp, create_path_6());
- test_path(dt, rt, rp, create_path_7());
- test_path(dt, rt, rp, create_path_8());
- test_path(dt, rt, rp, create_path_9());
- test_path(dt, rt, rp, create_path_10());
- test_path(dt, rt, rp, create_path_11());
- test_path(dt, rt, rp, create_path_12());
- test_path(dt, rt, rp, create_path_13());
- test_path(dt, rt, rp, create_path_14());
- test_path(dt, rt, rp, create_path_15());
+ test_path(dt, drawContext.get(), rp, create_path_0());
+ test_path(dt, drawContext.get(), rp, create_path_1());
+ test_path(dt, drawContext.get(), rp, create_path_2());
+ test_path(dt, drawContext.get(), rp, create_path_3());
+ test_path(dt, drawContext.get(), rp, create_path_4());
+ test_path(dt, drawContext.get(), rp, create_path_5());
+ test_path(dt, drawContext.get(), rp, create_path_6());
+ test_path(dt, drawContext.get(), rp, create_path_7());
+ test_path(dt, drawContext.get(), rp, create_path_8());
+ test_path(dt, drawContext.get(), rp, create_path_9());
+ test_path(dt, drawContext.get(), rp, create_path_10());
+ test_path(dt, drawContext.get(), rp, create_path_11());
+ test_path(dt, drawContext.get(), rp, create_path_12());
+ test_path(dt, drawContext.get(), rp, create_path_13());
+ test_path(dt, drawContext.get(), rp, create_path_14());
+ test_path(dt, drawContext.get(), rp, create_path_15());
}
#endif