diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-21 13:26:13 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 13:26:22 +0000 |
| commit | eaa78c45002b4a6e43f4fe2028652b050132dad2 (patch) | |
| tree | 00c45b889ac05a1a7e34a33f0e301bb2f73b4e5c /gm/image_pict.cpp | |
| parent | 107524c2a26e81ebeb2edaa62a96df3bcde0d0c7 (diff) | |
Revert "Make SkImage_Gpu be deferred"
This reverts commit 0db235bc0278887c344eb25b4681e9cca4cf892a.
Reason for revert: cc_unittests failing
Original change's description:
> 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>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia15590a1fae04b52723713760fdbf0492ad36286
Reviewed-on: https://skia-review.googlesource.com/9962
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm/image_pict.cpp')
| -rw-r--r-- | gm/image_pict.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp index 883fd34725..a6e0bdfcdd 100644 --- a/gm/image_pict.cpp +++ b/gm/image_pict.cpp @@ -344,7 +344,6 @@ protected: static void draw_as_tex(SkCanvas* canvas, SkImageCacherator* cache, SkScalar x, SkScalar y) { #if SK_SUPPORT_GPU sk_sp<SkColorSpace> texColorSpace; - // MDB TODO: this should be lockAsTextureRef sk_sp<GrTexture> texture( cache->lockAsTexture(canvas->getGrContext(), GrSamplerParams::ClampBilerp(), canvas->imageInfo().colorSpace(), &texColorSpace, @@ -360,13 +359,9 @@ protected: canvas->drawLine(r.left(), r.bottom(), r.right(), r.top(), paint); return; } - - sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrapped(std::move(texture)); - // No API to draw a GrTexture directly, so we cheat and create a private image subclass - sk_sp<SkImage> image(new SkImage_Gpu(canvas->getGrContext(), - cache->uniqueID(), kPremul_SkAlphaType, - std::move(proxy), std::move(texColorSpace), + sk_sp<SkImage> image(new SkImage_Gpu(cache->uniqueID(), kPremul_SkAlphaType, + std::move(texture), std::move(texColorSpace), SkBudgeted::kNo)); canvas->drawImage(image.get(), x, y); #endif |