diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-02-28 16:37:34 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-28 16:37:47 +0000 |
| commit | 5c56af1790f58e24d7e9a887c73637fee9b97b38 (patch) | |
| tree | 2474d26d20cbe3671868b2740a4cd345c5217b6c /gn/gpu.gni | |
| parent | dabef9dddd4f6a4d083b3a644dfd6d493b4649f0 (diff) | |
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 <robertphillips@google.com>
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
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 <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gn/gpu.gni')
| -rw-r--r-- | gn/gpu.gni | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 27a50a9a70..a34e62b6b4 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -392,8 +392,8 @@ skia_gpu_sources = [ "$_src/gpu/effects/GrYUVtoRGBEffect.h", # text - "$_src/gpu/text/GrAtlasManager.cpp", - "$_src/gpu/text/GrAtlasManager.h", + "$_src/gpu/text/GrAtlasGlyphCache.cpp", + "$_src/gpu/text/GrAtlasGlyphCache.h", "$_src/gpu/text/GrAtlasTextBlob.cpp", "$_src/gpu/text/GrAtlasTextBlobVertexRegenerator.cpp", "$_src/gpu/text/GrAtlasTextBlob.h", @@ -401,8 +401,6 @@ skia_gpu_sources = [ "$_src/gpu/text/GrAtlasTextContext.h", "$_src/gpu/text/GrDistanceFieldAdjustTable.cpp", "$_src/gpu/text/GrDistanceFieldAdjustTable.h", - "$_src/gpu/text/GrGlyphCache.cpp", - "$_src/gpu/text/GrGlyphCache.h", "$_src/gpu/text/GrTextBlobCache.cpp", "$_src/gpu/text/GrTextBlobCache.h", "$_src/gpu/text/GrTextUtils.cpp", |