diff options
author | Robert Phillips <robertphillips@google.com> | 2017-03-20 14:37:13 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 11:39:41 +0000 |
commit | 0db235bc0278887c344eb25b4681e9cca4cf892a (patch) | |
tree | 853a3e84db8d689e36ff5e6730ac38d77a621f14 /tests | |
parent | 53262d0ff466668bfbc76893ba5a581203269572 (diff) |
Make SkImage_Gpu be deferred
This CL removes the GrTexture-based ctor forcing everyone to create deferred SkImage_Gpus.
split out into:
https://skia-review.googlesource.com/c/9106/ (Remove atlas creation from GrResourceProvider)
Change-Id: I266bbe089c242fe54d5b7adcc7895aa5a39440a0
Reviewed-on: https://skia-review.googlesource.com/6680
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/SpecialImageTest.cpp | 2 | ||||
-rw-r--r-- | tests/SurfaceTest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 6c1f1bc04a..70d6fd4b38 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -120,7 +120,7 @@ static void test_image(const sk_sp<SkSpecialImage>& img, skiatest::Reporter* rep REPORTER_ASSERT(reporter, tightImg->width() == subset.width()); REPORTER_ASSERT(reporter, tightImg->height() == subset.height()); - REPORTER_ASSERT(reporter, isGPUBacked == !!tightImg->isTextureBacked()); + REPORTER_ASSERT(reporter, isGPUBacked == tightImg->isTextureBacked()); SkPixmap tmpPixmap; REPORTER_ASSERT(reporter, isGPUBacked != !!tightImg->peekPixels(&tmpPixmap)); } diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 6264196640..f620cff996 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -451,7 +451,7 @@ static SkBudgeted is_budgeted(const sk_sp<SkSurface>& surf) { } static SkBudgeted is_budgeted(SkImage* image) { - return ((SkImage_Gpu*)image)->peekTexture()->resourcePriv().isBudgeted(); + return ((SkImage_Gpu*)image)->peekProxy()->isBudgeted(); } static SkBudgeted is_budgeted(const sk_sp<SkImage> image) { |