diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-25 10:16:35 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-25 17:34:29 +0000 |
| commit | 066f020bb6cb9dbb12b977fcddd93982201777fe (patch) | |
| tree | 792f93eeb1503885417576d7b3f8d5627b6357af /include | |
| parent | e4832b287c6d0ae4a4a193f0144736f7eb6a824d (diff) | |
Reduce dependence on GrSurface's origin field (take 3)
TBR=bsalomon@google.com
Change-Id: I8c95c6774897dbd87e3c5c87d92f75c5b64d4e76
Reviewed-on: https://skia-review.googlesource.com/26424
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/GrRenderTargetProxy.h | 2 | ||||
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 6 | ||||
| -rw-r--r-- | include/private/GrTextureProxy.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/private/GrRenderTargetProxy.h b/include/private/GrRenderTargetProxy.h index 61c3ecb8d7..0bfa294c3c 100644 --- a/include/private/GrRenderTargetProxy.h +++ b/include/private/GrRenderTargetProxy.h @@ -66,7 +66,7 @@ protected: SkBackingFit, SkBudgeted, uint32_t flags); // Wrapped version - GrRenderTargetProxy(sk_sp<GrSurface>); + GrRenderTargetProxy(sk_sp<GrSurface>, GrSurfaceOrigin); sk_sp<GrSurface> createSurface(GrResourceProvider*) const override; diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 71eaf138bf..efd078a1c3 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -173,8 +173,8 @@ private: class GrSurfaceProxy : public GrIORefProxy { public: - static sk_sp<GrSurfaceProxy> MakeWrapped(sk_sp<GrSurface>); - static sk_sp<GrTextureProxy> MakeWrapped(sk_sp<GrTexture>); + static sk_sp<GrSurfaceProxy> MakeWrapped(sk_sp<GrSurface>, GrSurfaceOrigin); + static sk_sp<GrTextureProxy> MakeWrapped(sk_sp<GrTexture>, GrSurfaceOrigin); static sk_sp<GrTextureProxy> MakeDeferred(GrResourceProvider*, const GrSurfaceDesc&, SkBackingFit, @@ -352,7 +352,7 @@ protected: } // Wrapped version - GrSurfaceProxy(sk_sp<GrSurface> surface, SkBackingFit fit); + GrSurfaceProxy(sk_sp<GrSurface> surface, GrSurfaceOrigin origin, SkBackingFit fit); virtual ~GrSurfaceProxy(); diff --git a/include/private/GrTextureProxy.h b/include/private/GrTextureProxy.h index 60be19ecef..4d87533691 100644 --- a/include/private/GrTextureProxy.h +++ b/include/private/GrTextureProxy.h @@ -45,7 +45,7 @@ protected: GrTextureProxy(const GrSurfaceDesc& srcDesc, SkBackingFit, SkBudgeted, const void* srcData, size_t srcRowBytes, uint32_t flags); // Wrapped version - GrTextureProxy(sk_sp<GrSurface>); + GrTextureProxy(sk_sp<GrSurface>, GrSurfaceOrigin); SkDestinationSurfaceColorMode mipColorMode() const { return fMipColorMode; } |