diff options
author | Brian Osman <brianosman@google.com> | 2017-02-07 11:23:28 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 16:58:07 +0000 |
commit | 041f7dfc577822f1e97721a865f86a9a02660cf9 (patch) | |
tree | e97779c04ea0d2059cbd6291de3cbfbf27c1cc61 /tests/DeviceTest.cpp | |
parent | 2bb94e814726cbe8e0a6a5763e262a5ccea9313c (diff) |
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 <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/DeviceTest.cpp')
-rw-r--r-- | tests/DeviceTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<SkSurface> 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()); |