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 /src/image/SkImage_Gpu.h | |
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 'src/image/SkImage_Gpu.h')
-rw-r--r-- | src/image/SkImage_Gpu.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h index 858419156c..53c38dc278 100644 --- a/src/image/SkImage_Gpu.h +++ b/src/image/SkImage_Gpu.h @@ -21,6 +21,7 @@ class SkImage_Gpu : public SkImage_Base { public: + SkImage_Gpu(uint32_t uniqueID, SkAlphaType, sk_sp<GrTexture>, sk_sp<SkColorSpace>, SkBudgeted); SkImage_Gpu(GrContext*, uint32_t uniqueID, SkAlphaType, sk_sp<GrTextureProxy>, sk_sp<SkColorSpace>, SkBudgeted); ~SkImage_Gpu() override; @@ -33,9 +34,6 @@ public: sk_sp<SkColorSpace>*, SkScalar scaleAdjust[2]) const override; sk_sp<SkImage> onMakeSubset(const SkIRect&) const override; - GrTextureProxy* peekProxy() const override { - return fProxy.get(); - } GrTexture* peekTexture() const override { return fProxy->instantiate(fContext->resourceProvider()); } @@ -45,14 +43,10 @@ public: sk_sp<GrTextureProxy> asTextureProxyRef(GrContext*, const GrSamplerParams&, SkColorSpace*, sk_sp<SkColorSpace>*, SkScalar scaleAdjust[2]) const override; - sk_sp<GrTexture> refPinnedTexture(uint32_t* uniqueID) const override { *uniqueID = this->uniqueID(); return sk_ref_sp(this->peekTexture()); } - GrBackendObject onGetTextureHandle(bool flushPendingGrContextIO, - GrSurfaceOrigin* origin) const override; - GrTexture* onGetTexture() const override; bool onReadYUV8Planes(const SkISize sizes[3], void* const planes[3], const size_t rowBytes[3], SkYUVColorSpace colorSpace) const override; |