From 7226c232d73356a37ec8cfef0ed55147e68dd2fd Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 30 Jul 2018 13:13:17 -0400 Subject: Make GrTextureProxy store a GrTextureType. Removes flag indicating rectangle or external as its now redundant. Bug: skia: Change-Id: Ia475b557390e7a6b0f19f6e189cf8c27090e397c Reviewed-on: https://skia-review.googlesource.com/144346 Reviewed-by: Greg Daniel Commit-Queue: Brian Salomon --- include/private/GrTextureProxy.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'include/private/GrTextureProxy.h') diff --git a/include/private/GrTextureProxy.h b/include/private/GrTextureProxy.h index fc7f1c54a7..38469547d1 100644 --- a/include/private/GrTextureProxy.h +++ b/include/private/GrTextureProxy.h @@ -72,12 +72,12 @@ protected: friend class GrTextureProxyPriv; // Deferred version - when constructed with data the origin is always kTopLeft. - GrTextureProxy(const GrSurfaceDesc& srcDesc, GrMipMapped, SkBackingFit, SkBudgeted, - const void* srcData, size_t srcRowBytes, GrInternalSurfaceFlags); + GrTextureProxy(const GrSurfaceDesc& srcDesc, GrMipMapped, GrTextureType, SkBackingFit, + SkBudgeted, const void* srcData, size_t srcRowBytes, GrInternalSurfaceFlags); // Deferred version - no data. - GrTextureProxy(const GrSurfaceDesc& srcDesc, GrSurfaceOrigin, GrMipMapped, SkBackingFit, - SkBudgeted, GrInternalSurfaceFlags); + GrTextureProxy(const GrSurfaceDesc& srcDesc, GrSurfaceOrigin, GrMipMapped, GrTextureType, + SkBackingFit, SkBudgeted, GrInternalSurfaceFlags); // Lazy-callback version // There are two main use cases for lazily-instantiated proxies: @@ -90,7 +90,7 @@ protected: // The minimal knowledge version is used for CCPR where we are generating an atlas but we do not // know the final size until flush time. GrTextureProxy(LazyInstantiateCallback&&, LazyInstantiationType, const GrSurfaceDesc& desc, - GrSurfaceOrigin, GrMipMapped, SkBackingFit, SkBudgeted, + GrSurfaceOrigin, GrMipMapped, GrTextureType, SkBackingFit, SkBudgeted, GrInternalSurfaceFlags); // Wrapped version @@ -100,15 +100,9 @@ protected: sk_sp createSurface(GrResourceProvider*) const override; - void setIsGLTextureRectangleOrExternal() { - fSurfaceFlags |= GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal; - } - bool isGLTextureRectangleOrExternal() const { - return fSurfaceFlags & GrInternalSurfaceFlags::kIsGLTextureRectangleOrExternal; - } - private: GrMipMapped fMipMapped; + GrTextureType fTextureType; GrUniqueKey fUniqueKey; GrProxyProvider* fProxyProvider; // only set when fUniqueKey is valid -- cgit v1.2.3