aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2018-07-19 20:10:37 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-19 20:10:46 +0000
commit6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc (patch)
tree57e5d832d16aa9a0447e5102fe9811e39f8403d9 /include/gpu
parent736db1081b378ac8c167dfbc0322470d28c1cb3e (diff)
Reland "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c. Reason for revert: Breaking ANGLE. Original change's description: > 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> TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142588 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/GrContext.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 116c8bfcd9..c1804e00ff 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -13,7 +13,6 @@
#include "SkTypes.h"
#include "../private/GrAuditTrail.h"
#include "../private/GrSingleOwner.h"
-#include "../private/GrSkSLFPFactoryCache.h"
#include "GrContextOptions.h"
// We shouldn't need this but currently Android is relying on this being include transitively.
@@ -302,7 +301,6 @@ protected:
const GrBackend fBackend;
sk_sp<const GrCaps> fCaps;
sk_sp<GrContextThreadSafeProxy> fThreadSafeProxy;
- sk_sp<GrSkSLFPFactoryCache> fFPFactoryCache;
private:
sk_sp<GrGpu> fGpu;
@@ -430,14 +428,12 @@ private:
GrContextThreadSafeProxy(sk_sp<const GrCaps> caps,
uint32_t uniqueID,
GrBackend backend,
- const GrContextOptions& options,
- sk_sp<GrSkSLFPFactoryCache> cache);
-
- sk_sp<const GrCaps> fCaps;
- const uint32_t fContextUniqueID;
- const GrBackend fBackend;
- const GrContextOptions fOptions;
- sk_sp<GrSkSLFPFactoryCache> fFPFactoryCache;
+ const GrContextOptions& options);
+
+ sk_sp<const GrCaps> fCaps;
+ const uint32_t fContextUniqueID;
+ const GrBackend fBackend;
+ const GrContextOptions fOptions;
friend class GrDirectContext; // To construct this object
friend class GrContextThreadSafeProxyPriv;