commit bb60677d5244cb20ec659d035701e92cd1f6f4fa
author Robert Phillips <robertphillips@google.com> Mon Feb 04 17:50:57 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 05 01:31:05 2019 +0000
tree c57191a8f8dd1d2f38098c79d5d0e7ca5e99ecd8
parent 2d35a1c875539b744631a75a037f2b5d2e72c31f

Move caps and FP factory cache to GrContext_Base

Both GrContext and GrContextThreadSafeProxy had their own copies. This centralizes ownership and standardizes how all the contexts get initialized.

Change-Id: Ib2e418fbb53fcd6b0054789ef30a5fc4a3d80b20
Reviewed-on: https://skia-review.googlesource.com/c/189305
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/effects/GrSkSLFP.cpp

diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 7463c28..3b2b43c 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -234,7 +234,7 @@
 std::unique_ptr<GrSkSLFP> GrSkSLFP::Make(GrContext* context, int index, const char* name,
                                          const char* sksl, const void* inputs,
                                          size_t inputSize) {
-    return std::unique_ptr<GrSkSLFP>(new GrSkSLFP(context->priv().getFPFactoryCache(),
+    return std::unique_ptr<GrSkSLFP>(new GrSkSLFP(context->priv().fpFactoryCache(),
                                                   context->priv().caps()->shaderCaps(),
                                                   index, name, sksl, inputs, inputSize));
 }