Reduce usage of MakeRenderTargetDirect
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2187573002
Review-Url: https://codereview.chromium.org/2187573002
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 8d2ba51..87c3a52 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -56,7 +56,7 @@
if (requestedInfo) {
*requestedInfo = info;
}
- return SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info, 0, nullptr);
+ return SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info);
}
static sk_sp<SkSurface> create_gpu_scratch_surface(GrContext* context,
SkAlphaType at = kPremul_SkAlphaType,
@@ -65,7 +65,7 @@
if (requestedInfo) {
*requestedInfo = info;
}
- return SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info, 0, nullptr);
+ return SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info);
}
#endif
@@ -79,8 +79,7 @@
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceEmpty_Gpu, reporter, ctxInfo) {
const SkImageInfo info = SkImageInfo::Make(0, 0, kN32_SkColorType, kPremul_SkAlphaType);
REPORTER_ASSERT(reporter, nullptr ==
- SkSurface::MakeRenderTarget(ctxInfo.grContext(), SkBudgeted::kNo, info, 0,
- nullptr));
+ SkSurface::MakeRenderTarget(ctxInfo.grContext(), SkBudgeted::kNo, info));
}
#endif
@@ -335,13 +334,13 @@
desc.fHeight = 10;
desc.fFlags = kRenderTarget_GrBackendTextureFlag;
desc.fTextureHandle = textureObject;
- GrTexture* texture = context->textureProvider()->wrapBackendTexture(desc);
+
{
- auto surface(SkSurface::MakeRenderTargetDirect(texture->asRenderTarget(), nullptr));
+ sk_sp<SkSurface> surface(SkSurface::MakeFromBackendTexture(context, desc, nullptr));
test_unique_image_snap(reporter, surface.get(), true, imageBackingStore,
surfaceBackingStore);
}
- texture->unref();
+
context->getGpu()->deleteTestingOnlyBackendTexture(textureObject);
}
}