diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrContext.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 1b43d99f2e..ff4ec5f677 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -36,7 +36,6 @@ class GrRenderTargetContext; class GrResourceEntry; class GrResourceCache; class GrResourceProvider; -class GrRestrictedAtlasManager; class GrSamplerState; class GrSurfaceProxy; class GrSwizzle; @@ -128,7 +127,7 @@ public: * The typical use case for this function is that the underlying 3D context was lost and further * API calls may crash. */ - virtual void abandonContext(); + void abandonContext(); /** * This is similar to abandonContext() however the underlying 3D context is not yet lost and @@ -139,7 +138,7 @@ public: * but can't guarantee that GrContext will be destroyed first (perhaps because it may be ref'ed * elsewhere by either the client or Skia objects). */ - virtual void releaseResourcesAndAbandonContext(); + void releaseResourcesAndAbandonContext(); /////////////////////////////////////////////////////////////////////////// // Resource Cache @@ -184,7 +183,7 @@ public: * Frees GPU created by the context. Can be called to reduce GPU memory * pressure. */ - virtual void freeGpuResources(); + void freeGpuResources(); /** * Purge all the unlocked resources from the cache. @@ -359,15 +358,9 @@ protected: GrContext(GrContextThreadSafeProxy*); GrContext(GrBackend); - virtual bool init(const GrContextOptions&); // init must be called after either constructor. - - virtual GrAtlasManager* onGetFullAtlasManager() = 0; - virtual GrRestrictedAtlasManager* onGetRestrictedAtlasManager() = 0; - - sk_sp<const GrCaps> fCaps; - private: sk_sp<GrGpu> fGpu; + sk_sp<const GrCaps> fCaps; GrResourceCache* fResourceCache; GrResourceProvider* fResourceProvider; GrProxyProvider* fProxyProvider; @@ -375,6 +368,7 @@ private: sk_sp<GrContextThreadSafeProxy> fThreadSafeProxy; GrGlyphCache* fGlyphCache; + GrAtlasManager* fFullAtlasManager; std::unique_ptr<GrTextBlobCache> fTextBlobCache; bool fDisableGpuYUVConversion; @@ -410,6 +404,8 @@ private: // TODO: have the GrClipStackClip use renderTargetContexts and rm this friending friend class GrContextPriv; + bool init(const GrContextOptions&); // init must be called after either constructor. + /** * These functions create premul <-> unpremul effects. If the second argument is 'true', they * use the specialized round-trip effects from GrConfigConversionEffect, otherwise they |