diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-12 14:02:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 19:00:55 +0000 |
| commit | 97ae0c89025dfd791047f5701e57d58da37c125c (patch) | |
| tree | d944775c2c88dd36d5e40fb6c1bae5c7c2376e3b /src/gpu/GrContext.cpp | |
| parent | 310f44d3d5298becdd8ab235af29789f6ed769b5 (diff) | |
Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.
Bug: skia:
Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
Reviewed-on: https://skia-review.googlesource.com/137391
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrContext.cpp')
| -rw-r--r-- | src/gpu/GrContext.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index caed7298ae..8380f0d711 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -37,7 +37,9 @@ #include "SkTaskGroup.h" #include "SkUnPreMultiplyPriv.h" #include "effects/GrConfigConversionEffect.h" +#include "effects/GrSkSLFP.h" #include "text/GrTextBlobCache.h" +#include <unordered_map> #define ASSERT_OWNED_PROXY(P) \ SkASSERT(!(P) || !((P)->priv().peekTexture()) || (P)->priv().peekTexture()->getContext() == this) @@ -160,7 +162,6 @@ GrContext::~GrContext() { if (fDrawingManager) { fDrawingManager->cleanup(); } - fTextureStripAtlasManager = nullptr; delete fResourceProvider; delete fResourceCache; @@ -172,11 +173,13 @@ GrContext::~GrContext() { GrContextThreadSafeProxy::GrContextThreadSafeProxy(sk_sp<const GrCaps> caps, uint32_t uniqueID, GrBackend backend, - const GrContextOptions& options) + const GrContextOptions& options, + sk_sp<GrSkSLFPFactoryCache> cache) : fCaps(std::move(caps)) , fContextUniqueID(uniqueID) , fBackend(backend) - , fOptions(options) {} + , fOptions(options) + , fFPFactoryCache(std::move(cache)) {} GrContextThreadSafeProxy::~GrContextThreadSafeProxy() = default; |