diff options
author | Robert Phillips <robertphillips@google.com> | 2017-03-21 16:22:00 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 11:52:16 +0000 |
commit | 0ae6faa34d73ffc7ebec3d13f0473703bade821b (patch) | |
tree | d54d076330e9da961cd198732aca245ee7b4a646 /include/private | |
parent | 54d212e1bfaea0be88c3c40820d0b1ae0daebecf (diff) |
Make SkImage_Gpu be deferred (take 2)
This CL removes the GrTexture-based ctor forcing everyone to create deferred SkImage_Gpus.
relanding of: https://skia-review.googlesource.com/c/6680/ (Make SkImage_Gpu be deferred)
split out into:
https://skia-review.googlesource.com/c/9106/ (Remove atlas creation from GrResourceProvider)
Change-Id: I834ede430b9706cf9b675bdfdddf1c8c624c2f14
Reviewed-on: https://skia-review.googlesource.com/9965
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/GrSurfaceProxy.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 454916ef17..0443227d3c 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -281,10 +281,13 @@ public: } // Helper function that creates a temporary SurfaceContext to perform the copy + // It always returns a kExact-backed proxy bc it is used when converting an SkSpecialImage + // to an SkImage. static sk_sp<GrTextureProxy> Copy(GrContext*, GrSurfaceProxy* src, SkIRect srcRect, SkBudgeted); // Copy the entire 'src' + // It always returns a kExact-backed proxy bc it is used in SkGpuDevice::snapSpecial static sk_sp<GrTextureProxy> Copy(GrContext* context, GrSurfaceProxy* src, SkBudgeted budgeted); @@ -327,8 +330,8 @@ protected: } // For wrapped resources, 'fDesc' will always be filled in from the wrapped resource. - const GrSurfaceDesc fDesc; - const SkBackingFit fFit; // always exact for wrapped resources + GrSurfaceDesc fDesc; + SkBackingFit fFit; // always exact for wrapped resources mutable SkBudgeted fBudgeted; // set from the backing resource for wrapped resources // mutable bc of SkSurface/SkImage wishy-washiness const uint32_t fFlags; |