From d17f6584df9e48146dac28a1df56fb4978de6ba3 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Wed, 19 Jul 2017 18:28:58 -0400 Subject: Remove GrBackendTextureDesc Change-Id: I2b123d1782400e97ab2ce2f11e3e3d325a13e6c8 Reviewed-on: https://skia-review.googlesource.com/24748 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- tests/WritePixelsTest.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'tests/WritePixelsTest.cpp') diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 3aec3e68da..e876c8ff05 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -13,8 +13,10 @@ #include "sk_tool_utils.h" #if SK_SUPPORT_GPU +#include "GrBackendSurface.h" #include "GrContext.h" #include "GrGpu.h" +#include "GrTest.h" #endif #include @@ -429,26 +431,21 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WritePixelsNonTexture_Gpu, reporter, ctxInfo) for (auto& origin : { kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin }) { for (int sampleCnt : {0, 4}) { - GrBackendTextureDesc desc; - desc.fConfig = kSkia8888_GrPixelConfig; - desc.fWidth = DEV_W; - desc.fHeight = DEV_H; - desc.fFlags = kRenderTarget_GrBackendTextureFlag; - desc.fSampleCnt = sampleCnt; - desc.fOrigin = origin; - desc.fTextureHandle = context->getGpu()->createTestingOnlyBackendTexture( - nullptr, DEV_W, DEV_H, kSkia8888_GrPixelConfig, true); - sk_sp surface(SkSurface::MakeFromBackendTextureAsRenderTarget(context, desc, - nullptr)); + auto handle = context->getGpu()->createTestingOnlyBackendTexture( + nullptr, DEV_W, DEV_H, kSkia8888_GrPixelConfig, true); + GrBackendTexture backendTexture = GrTest::CreateBackendTexture( + ctxInfo.backend(), DEV_W, DEV_H, kSkia8888_GrPixelConfig, handle); + sk_sp surface(SkSurface::MakeFromBackendTextureAsRenderTarget( + context, backendTexture, origin, sampleCnt, nullptr, nullptr)); if (!surface) { - context->getGpu()->deleteTestingOnlyBackendTexture(desc.fTextureHandle); + context->getGpu()->deleteTestingOnlyBackendTexture(handle); continue; } test_write_pixels(reporter, surface.get()); surface.reset(); - context->getGpu()->deleteTestingOnlyBackendTexture(desc.fTextureHandle); + context->getGpu()->deleteTestingOnlyBackendTexture(handle); } } } -- cgit v1.2.3