commit 9555f2934d1a5eb36ae79a598dffa5ac98cc4f7d
author Adlai Holler <adlai@google.com> Fri Oct 09 09:41:14 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 09 14:42:43 2020 +0000
tree 178df4b0502c57739d173a5b2a2e9ffefccf062f
parent eaaa71b705aa39679d219897d372806786becbcc

Reland "Merge GrContext::init into GrDirectContext ..."

This reverts commit e9b9c3bd7f1900264f18ffe9b3d2b9ff41a7f5cd.

Reason for revert: Fixed MSVC

Original change's description:
> Revert "Merge GrContext::init into GrDirectContext ..."
>
> This reverts commit 48d8724097d0b108259c2aef7df8ed1aa08bd574.
>
> Reason for revert: Breaking MSVC bots
>
> Original change's description:
> > Merge GrContext::init into GrDirectContext ...
> >
> > And minor cleanups associated with the initialization of these classes.
> >
> > Change-Id: Ida0372d0b1a0b8bf5b309814de5418e47ea34fdb
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324122
> > Commit-Queue: Adlai Holler <adlai@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > Auto-Submit: Adlai Holler <adlai@google.com>
>
> TBR=robertphillips@google.com,adlai@google.com
>
> Change-Id: I00b2ddaeaef53e3fe05a338c88158cf235f325c4
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324132
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>

TBR=jvanverth@google.com,robertphillips@google.com,adlai@google.com


Change-Id: I88bac7cd3aab070460671e82cbd924fbb42a2740
Cq-Include-Trybots: luci.skia.skia.primary:Build-Win-MSVC-x86_64-Release-Shared,Build-Win-Clang-x86_64-Release-Shared
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324616
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Adlai Holler <adlai@google.com>

src/gpu/GrDirectContext.cpp

diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 84b6c59..239ae4a 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -9,9 +9,13 @@
 #include "include/gpu/GrDirectContext.h"
 
 #include "include/gpu/GrContextThreadSafeProxy.h"
+#include "src/core/SkTaskGroup.h"
+#include "src/gpu/GrClientMappedBufferManager.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrContextThreadSafeProxyPriv.h"
 #include "src/gpu/GrGpu.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrShaderUtils.h"
 
 #include "src/gpu/effects/GrSkSLFP.h"
 #include "src/gpu/gl/GrGLGpu.h"
@@ -45,16 +49,27 @@
 static const bool kDefaultReduceOpsTaskSplitting = false;
 #endif
 
+#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(this->singleOwner())
+
 GrDirectContext::GrDirectContext(GrBackendApi backend, const GrContextOptions& options)
         : INHERITED(GrContextThreadSafeProxyPriv::Make(backend, options)) {
 }
 
 GrDirectContext::~GrDirectContext() {
+    ASSERT_SINGLE_OWNER
     // this if-test protects against the case where the context is being destroyed
     // before having been fully created
-    if (this->priv().getGpu()) {
+    if (fGpu) {
         this->flushAndSubmit();
     }
+
+    this->destroyDrawingManager();
+    fMappedBufferManager.reset();
+
+    // Ideally we could just let the ptr drop, but resource cache queries this ptr in releaseAll.
+    if (fResourceCache) {
+        fResourceCache->releaseAll();
+    }
 }
 
 void GrDirectContext::abandonContext() {
@@ -84,16 +99,42 @@
 }
 
 bool GrDirectContext::init() {
-    const GrGpu* gpu = this->priv().getGpu();
-    if (!gpu) {
+    ASSERT_SINGLE_OWNER
+    if (!fGpu) {
         return false;
     }
 
-    fThreadSafeProxy->priv().init(gpu->refCaps());
+    fThreadSafeProxy->priv().init(fGpu->refCaps());
     if (!INHERITED::init()) {
         return false;
     }
 
+    SkASSERT(this->getTextBlobCache());
+    SkASSERT(this->threadSafeCache());
+
+    fStrikeCache = std::make_unique<GrStrikeCache>();
+    fResourceCache = std::make_unique<GrResourceCache>(this->caps(), this->singleOwner(),
+                                                       this->contextID());
+    fResourceCache->setProxyProvider(this->proxyProvider());
+    fResourceCache->setThreadSafeCache(this->threadSafeCache());
+    fResourceProvider = std::make_unique<GrResourceProvider>(fGpu.get(), fResourceCache.get(),
+                                                             this->singleOwner());
+    fMappedBufferManager = std::make_unique<GrClientMappedBufferManager>(this->contextID());
+
+    fDidTestPMConversions = false;
+
+    // DDL TODO: we need to think through how the task group & persistent cache
+    // get passed on to/shared between all the DDLRecorders created with this context.
+    if (this->options().fExecutor) {
+        fTaskGroup = std::make_unique<SkTaskGroup>(*this->options().fExecutor);
+    }
+
+    fPersistentCache = this->options().fPersistentCache;
+    fShaderErrorHandler = this->options().fShaderErrorHandler;
+    if (!fShaderErrorHandler) {
+        fShaderErrorHandler = GrShaderUtils::DefaultShaderErrorHandler();
+    }
+
     bool reduceOpsTaskSplitting = kDefaultReduceOpsTaskSplitting;
     if (GrContextOptions::Enable::kNo == this->options().fReduceOpsTaskSplitting) {
         reduceOpsTaskSplitting = false;