aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/DeviceTest.cpp
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2016-12-05 16:12:48 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-09 19:34:47 +0000
commitd263413a2a92cafe3fd3b051c67d00206c9a0e4d (patch)
treef127dd2c03ef707cd47396be0bf1cbf911403849 /tests/DeviceTest.cpp
parent784b7bf493c37236e3fe571aed6105939a9bc0c3 (diff)
Remove SkImage::makeTextureImage
No one (other than test code) was using this API, and it lacks the context to do the right thing. Specifically, if this forces a decode of an encoded image, we don't know the intended use (re: color spaces) to determine how we should decode. BUG=skia: Change-Id: I6ff700b3a5adce8257f35c5e3dd5ba557b2a3219 Reviewed-on: https://skia-review.googlesource.com/5614 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests/DeviceTest.cpp')
-rw-r--r--tests/DeviceTest.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp
index 34140a7488..9fb4fa2eac 100644
--- a/tests/DeviceTest.cpp
+++ b/tests/DeviceTest.cpp
@@ -106,7 +106,9 @@ 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
- image = image->makeTextureImage(context);
+ SkPixmap pixmap;
+ bm.peekPixels(&pixmap);
+ image = SkImage::MakeTextureFromPixmap(context, pixmap, SkBudgeted::kNo);
special = DeviceTestingAccess::MakeSpecial(gpuDev.get(), image.get());
SkASSERT(special->isTextureBacked());
SkASSERT(kWidth == special->width());