diff options
author | robertphillips <robertphillips@google.com> | 2016-04-28 09:55:15 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 09:55:15 -0700 |
commit | d4c741e3d0e0fa633399691c47f76b6c7841ee83 (patch) | |
tree | 3a242889fa24e3e209df4e0ec76049fbdde61721 /tests | |
parent | 23bd7e9273438863149ed58c089e9bf457e9892d (diff) |
Refactor drawContext/RenderTarget creation
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1914883002
Committed: https://skia.googlesource.com/skia/+/2f1c42e8448bbbadeb3df1c626faa90aa33f8907
Review-Url: https://codereview.chromium.org/1914883002
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ClearTest.cpp | 40 | ||||
-rw-r--r-- | tests/ClipBoundsTest.cpp | 18 | ||||
-rw-r--r-- | tests/PrimitiveProcessorTest.cpp | 17 |
3 files changed, 20 insertions, 55 deletions
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp index 1065d940ba..7a533ba19c 100644 --- a/tests/ClearTest.cpp +++ b/tests/ClearTest.cpp @@ -37,31 +37,18 @@ static bool check_rect(GrDrawContext* dc, const SkIRect& rect, uint32_t expected return true; } -// We only really need the DC, but currently the DC doesn't own the RT so we also ref it, but that -// could be dropped when DC is a proper owner of its RT. -static bool reset_dc(sk_sp<GrDrawContext>* dc, SkAutoTUnref<GrSurface>* rtKeepAlive, - GrContext* context, int w, int h) { +static bool reset_dc(sk_sp<GrDrawContext>* dc, GrContext* context, int w, int h) { SkDEBUGCODE(uint32_t oldID = 0;) if (*dc) { SkDEBUGCODE(oldID = (*dc)->accessRenderTarget()->getUniqueID();) - rtKeepAlive->reset(nullptr); dc->reset(nullptr); } context->freeGpuResources(); - GrTextureDesc desc; - desc.fWidth = w; - desc.fHeight = h; - desc.fConfig = kRGBA_8888_GrPixelConfig; - desc.fFlags = kRenderTarget_GrSurfaceFlag; + *dc = context->newDrawContext(GrContext::kTight_BackingFit, w, h, kRGBA_8888_GrPixelConfig); + + SkASSERT((*dc)->accessRenderTarget()->getUniqueID() != oldID); - rtKeepAlive->reset(context->textureProvider()->createTexture(desc, SkBudgeted::kYes)); - if (!(*rtKeepAlive)) { - return false; - } - GrRenderTarget* rt = (*rtKeepAlive)->asRenderTarget(); - SkASSERT(rt->getUniqueID() != oldID); - *dc = context->drawContext(sk_ref_sp(rt)); return *dc != nullptr; } @@ -72,7 +59,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { SkIRect fullRect = SkIRect::MakeWH(kW, kH); sk_sp<GrDrawContext> drawContext; - SkAutoTUnref<GrSurface> rtKeepAlive; // A rectangle that is inset by one on all sides and the 1-pixel wide rectangles that surround // it. @@ -96,7 +82,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { static const GrColor kColor1 = 0xABCDEF01; static const GrColor kColor2 = ~kColor1; - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -107,7 +93,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -119,7 +105,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -131,7 +117,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -143,7 +129,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -155,7 +141,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -174,7 +160,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -186,7 +172,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } @@ -214,7 +200,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, ctxInfo) { failX, failY); } - if (!reset_dc(&drawContext, &rtKeepAlive, context, kW, kH)) { + if (!reset_dc(&drawContext, context, kW, kH)) { ERRORF(reporter, "Could not create draw context."); return; } diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp index abdd3f44fa..5660afdc27 100644 --- a/tests/ClipBoundsTest.cpp +++ b/tests/ClipBoundsTest.cpp @@ -17,20 +17,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrClipBounds, reporter, ctxInfo) { static const int kXSize = 100; static const int kYSize = 100; - GrSurfaceDesc desc; - desc.fFlags = kRenderTarget_GrSurfaceFlag; - desc.fConfig = kAlpha_8_GrPixelConfig; - desc.fWidth = kXSize; - desc.fHeight = kYSize; - - SkAutoTUnref<GrTexture> texture( - ctxInfo.fGrContext->textureProvider()->createTexture(desc, SkBudgeted::kYes, nullptr, 0)); - if (!texture) { - return; - } - - SkIRect intScreen = SkIRect::MakeWH(kXSize, kYSize); - SkRect screen = SkRect::Make(intScreen); + const SkIRect intScreen = SkIRect::MakeWH(kXSize, kYSize); + const SkRect screen = SkRect::Make(intScreen); SkRect clipRect(screen); clipRect.outset(10, 10); @@ -56,7 +44,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrClipBounds, reporter, ctxInfo) { clipData.setClipStack(&stack); SkIRect devGrClipBound; - clipData.getConservativeBounds(texture->width(), texture->height(), + clipData.getConservativeBounds(kXSize, kYSize, &devGrClipBound, &isIntersectionOfRects); diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 6d4ede1ce9..b1157a33a9 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -103,18 +103,9 @@ private: DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(VertexAttributeCount, reporter, ctxInfo) { GrContext* context = ctxInfo.fGrContext; - GrTextureDesc desc; - desc.fHeight = 1; - desc.fWidth = 1; - desc.fFlags = kRenderTarget_GrSurfaceFlag; - desc.fConfig = kRGBA_8888_GrPixelConfig; - SkAutoTUnref<GrTexture> target(context->textureProvider()->createTexture(desc, - SkBudgeted::kYes)); - if (!target) { - ERRORF(reporter, "Could not create render target."); - return; - } - sk_sp<GrDrawContext> dc(context->drawContext(sk_ref_sp(target->asRenderTarget()))); + + sk_sp<GrDrawContext> dc(context->newDrawContext(GrContext::kLoose_BackingFit, + 1, 1, kRGBA_8888_GrPixelConfig)); if (!dc) { ERRORF(reporter, "Could not create draw context."); return; @@ -132,7 +123,7 @@ DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(VertexAttributeCount, reporter, ctxInfo) { #endif SkAutoTUnref<GrDrawBatch> batch; GrPipelineBuilder pb; - pb.setRenderTarget(target->asRenderTarget()); + pb.setRenderTarget(dc->accessRenderTarget()); // This one should succeed. batch.reset(new Batch(attribCnt)); dc->drawContextPriv().testingOnly_drawBatch(pb, batch); |