From 041f7dfc577822f1e97721a865f86a9a02660cf9 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 7 Feb 2017 11:23:28 -0500 Subject: Bring back SkImage::makeTextureImage Ensures that an image is GPU backed on the passed-in GrContxt. The new version requires a destination color space (intended usage of the image), so we can make a proper decision about decoded format. This reverts commit d263413a2a92cafe3fd3b051c67d00206c9a0e4d. BUG=skia: Change-Id: Ibccddbafc301779559592045ed5a5fa9264e7432 Reviewed-on: https://skia-review.googlesource.com/8116 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon --- tests/DeviceTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/DeviceTest.cpp') diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp index dd1a9f2379..55c9421dbb 100644 --- a/tests/DeviceTest.cpp +++ b/tests/DeviceTest.cpp @@ -106,8 +106,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialImage_GPUDevice, reporter, ctxInfo) { SkASSERT(SkIRect::MakeWH(kWidth, kHeight) == special->subset()); // Create a gpu-backed special image from a gpu-backed SkImage - sk_sp surface(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, bm.info())); - image = surface->makeImageSnapshot(); + SkColorSpace* legacyColorSpace = nullptr; + image = image->makeTextureImage(context, legacyColorSpace); special = DeviceTestingAccess::MakeSpecial(gpuDev.get(), image.get()); SkASSERT(special->isTextureBacked()); SkASSERT(kWidth == special->width()); -- cgit v1.2.3