From 5c56af1790f58e24d7e9a887c73637fee9b97b38 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 28 Feb 2018 16:37:34 +0000 Subject: Revert "Fission GrAtlasGlyphCache in two" This reverts commit acf17904d6286f2a63a5d895541804d0ea1be646. Reason for revert: Chrome Original change's description: > Fission GrAtlasGlyphCache in two > > This CL splits the old GrAtlasGlyphCache into a GrAtlasGlyphCache and an GrAtlasManager. > > The GrAtlasManager itself is split into a rather limited base class (GrRestrictedAtlasManager) > and the all powerful GrAtlasManager. The GrRestrictedAtlasManager is available at op creation > time and provides access to the proxies backing the atlases. The full GrAtlasManager is > only available at flush time and allows instantiation of the proxies and uploading to them. > > In the DDL world all of the DDL Contexts will receive a GrRestrictedAtlasManager-version of the > GrAtlasManager in the main thread. This future atlas manager will have had all of its > GrDrawOpAtlases created (but not instantiated) so there should be no race conditions. > > Change-Id: I9967d3a4116af50128f390c5039a712b8cd4db08 > Reviewed-on: https://skia-review.googlesource.com/108001 > Commit-Queue: Robert Phillips > Reviewed-by: Jim Van Verth TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I7c760ea1a9f041a310b96d552aa1497ee5902cd8 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/111040 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- src/gpu/GrProxyProvider.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/gpu/GrProxyProvider.h') diff --git a/src/gpu/GrProxyProvider.h b/src/gpu/GrProxyProvider.h index 254686a613..dfd06dfe80 100644 --- a/src/gpu/GrProxyProvider.h +++ b/src/gpu/GrProxyProvider.h @@ -8,13 +8,13 @@ #ifndef GrProxyProvider_DEFINED #define GrProxyProvider_DEFINED -#include "GrCaps.h" #include "GrResourceKey.h" #include "GrTextureProxy.h" #include "GrTypes.h" #include "SkRefCnt.h" #include "SkTDynamicHash.h" +class GrCaps; class GrResourceProvider; class GrSingleOwner; class GrBackendRenderTarget; @@ -207,7 +207,6 @@ public: void processInvalidProxyUniqueKey(const GrUniqueKey&, GrTextureProxy*, bool invalidateSurface); const GrCaps* caps() const { return fCaps.get(); } - sk_sp refCaps() const { return fCaps; } void abandon() { fResourceCache = nullptr; -- cgit v1.2.3