From d21b2a5d5c5dca87b7df02713782e722a2c0ae92 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 12 Dec 2017 13:01:25 -0500 Subject: Remove GrBackendObject from tests (except image_from_yuv_textures) This sets the stage for landing https://skia-review.googlesource.com/c/skia/+/82823 (Update SkImage::MakeFromYUVTexturesCopy to GrBackendTexture) Change-Id: I2c62f23dc447b9ad55c0b5f06bcd6d7ca0ec4d2b Reviewed-on: https://skia-review.googlesource.com/83920 Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- tests/ImageTest.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'tests/ImageTest.cpp') diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 1ba3f1d0b4..483fbf7d18 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -767,16 +767,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c GrContext* ctx = ctxInfo.grContext(); - GrBackendObject backendTexHandle = - ctxInfo.grContext()->getGpu()->createTestingOnlyBackendTexture( - pixels.get(), kWidth, kHeight, kRGBA_8888_GrPixelConfig, true); - - GrBackendTexture backendTex = GrTest::CreateBackendTexture(ctx->contextPriv().getBackend(), - kWidth, - kHeight, - kRGBA_8888_GrPixelConfig, - GrMipMapped::kNo, - backendTexHandle); + GrBackendTexture backendTex = ctxInfo.grContext()->getGpu()->createTestingOnlyBackendTexture( + pixels.get(), kWidth, kHeight, kRGBA_8888_GrPixelConfig, true, GrMipMapped::kNo); TextureReleaseChecker releaseChecker; GrSurfaceOrigin texOrigin = kBottomLeft_GrSurfaceOrigin; @@ -806,7 +798,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c refImg.reset(nullptr); // force a release of the image REPORTER_ASSERT(reporter, 1 == releaseChecker.fReleaseCount); - ctxInfo.grContext()->getGpu()->deleteTestingOnlyBackendTexture(backendTexHandle); + ctxInfo.grContext()->getGpu()->deleteTestingOnlyBackendTexture(&backendTex); } static void test_cross_context_image(skiatest::Reporter* reporter, const GrContextOptions& options, -- cgit v1.2.3