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>
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 91f328f..57956d0 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -25,7 +25,6 @@
#include "src/gpu/GrResourceCache.h"
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/GrSemaphore.h"
-#include "src/gpu/GrShaderUtils.h"
#include "src/gpu/GrSoftwarePathRenderer.h"
#include "src/gpu/GrThreadSafeCache.h"
#include "src/gpu/GrTracing.h"
@@ -51,59 +50,9 @@
////////////////////////////////////////////////////////////////////////////////
-GrContext::GrContext(sk_sp<GrContextThreadSafeProxy> proxy) : INHERITED(std::move(proxy)) {
- fResourceCache = nullptr;
- fResourceProvider = nullptr;
-}
+GrContext::GrContext(sk_sp<GrContextThreadSafeProxy> proxy) : INHERITED(std::move(proxy)) { }
-GrContext::~GrContext() {
- ASSERT_SINGLE_OWNER
-
- this->destroyDrawingManager();
- fMappedBufferManager.reset();
- delete fResourceProvider;
- delete fResourceCache;
-}
-
-bool GrContext::init() {
- ASSERT_SINGLE_OWNER
- SkASSERT(this->proxyProvider());
-
- if (!INHERITED::init()) {
- return false;
- }
-
- SkASSERT(this->getTextBlobCache());
- SkASSERT(this->threadSafeCache());
-
- if (fGpu) {
- fStrikeCache = std::make_unique<GrStrikeCache>();
- fResourceCache = new GrResourceCache(this->caps(), this->singleOwner(), this->contextID());
- fResourceProvider = new GrResourceProvider(fGpu.get(), fResourceCache, this->singleOwner());
- fMappedBufferManager = std::make_unique<GrClientMappedBufferManager>(this->contextID());
- }
-
- if (fResourceCache) {
- fResourceCache->setProxyProvider(this->proxyProvider());
- fResourceCache->setThreadSafeCache(this->threadSafeCache());
- }
-
- 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();
- }
-
- return true;
-}
+GrContext::~GrContext() = default;
sk_sp<GrContextThreadSafeProxy> GrContext::threadSafeProxy() {
return INHERITED::threadSafeProxy();