commit 7b1678a5271402e00fbb2dd643ef852e3a462beb
author Brian Osman <brianosman@google.com> Mon Dec 16 09:17:25 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 16 15:59:04 2019 +0000
tree 856a7e7ab40da3901ba0393a8b0f90319611b3fb
parent 73630214563ebfb655d0a3df7786705995afbf12

Major refactor of runtime effects

Adds SkRuntimeEffect, a ref-counted object to hold SkSL,
a Compiler, and compiled Program, along with uniform info.

Removes the old SkSLFP factory and factory cache types.
Caching is done by simply holding on to the effect (or
the shader/color filter factories, which own an effect).

The effect class is simply ref'd by the factories, the
shader and color filter types, and the FP.

NOTE: Changes to public headers only affect private functions.

Change-Id: I0c1401505cb234e83943ad4ef2db6680f4c69fb9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259336
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrContext_Base.cpp

diff --git a/src/gpu/GrContext_Base.cpp b/src/gpu/GrContext_Base.cpp
index f7d3f77..c62f561 100644
--- a/src/gpu/GrContext_Base.cpp
+++ b/src/gpu/GrContext_Base.cpp
@@ -9,7 +9,6 @@
 
 #include "src/gpu/GrBaseContextPriv.h"
 #include "src/gpu/GrCaps.h"
-#include "src/gpu/GrSkSLFPFactoryCache.h"
 #include "src/gpu/effects/GrSkSLFP.h"
 
 static int32_t next_id() {
@@ -31,19 +30,16 @@
 
 GrContext_Base::~GrContext_Base() { }
 
-bool GrContext_Base::init(sk_sp<const GrCaps> caps, sk_sp<GrSkSLFPFactoryCache> FPFactoryCache) {
-    SkASSERT(caps && FPFactoryCache);
+bool GrContext_Base::init(sk_sp<const GrCaps> caps) {
+    SkASSERT(caps);
 
     fCaps = caps;
-    fFPFactoryCache = FPFactoryCache;
     return true;
 }
 
 const GrCaps* GrContext_Base::caps() const { return fCaps.get(); }
 sk_sp<const GrCaps> GrContext_Base::refCaps() const { return fCaps; }
 
-sk_sp<GrSkSLFPFactoryCache> GrContext_Base::fpFactoryCache() { return fFPFactoryCache; }
-
 GrBackendFormat GrContext_Base::defaultBackendFormat(SkColorType skColorType,
                                                      GrRenderable renderable) const {
     const GrCaps* caps = this->caps();
@@ -66,7 +62,3 @@
 sk_sp<const GrCaps> GrBaseContextPriv::refCaps() const {
     return fContext->refCaps();
 }
-
-sk_sp<GrSkSLFPFactoryCache> GrBaseContextPriv::fpFactoryCache() {
-    return fContext->fpFactoryCache();
-}