| Index: src/gpu/GrContext.cpp
|
| diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
|
| index 5d998f8a1017f6fb576e7c751b44274385791cdc..2ca3461a692917a1c2a97c2bb5a42aa8f41a1b1c 100644
|
| --- a/src/gpu/GrContext.cpp
|
| +++ b/src/gpu/GrContext.cpp
|
| @@ -7,172 +7,28 @@
|
| */
|
|
|
| #include "GrContext.h"
|
| -
|
| -#include "GrBatchFontCache.h"
|
| -#include "GrBatchFlushState.h"
|
| -#include "GrBatchTest.h"
|
| -#include "GrCaps.h"
|
| #include "GrContextOptions.h"
|
| -#include "GrDefaultGeoProcFactory.h"
|
| #include "GrDrawingManager.h"
|
| #include "GrDrawContext.h"
|
| -#include "GrDrawTarget.h"
|
| -#include "GrGpuResource.h"
|
| -#include "GrGpuResourcePriv.h"
|
| -#include "GrGpu.h"
|
| -#include "GrIndexBuffer.h"
|
| #include "GrLayerCache.h"
|
| -#include "GrOvalRenderer.h"
|
| -#include "GrPathRenderer.h"
|
| -#include "GrPathUtils.h"
|
| -#include "GrRenderTargetPriv.h"
|
| #include "GrResourceCache.h"
|
| #include "GrResourceProvider.h"
|
| #include "GrSoftwarePathRenderer.h"
|
| -#include "GrStencilAndCoverTextContext.h"
|
| -#include "GrStrokeInfo.h"
|
| #include "GrSurfacePriv.h"
|
| #include "GrTextBlobCache.h"
|
| -#include "GrTexturePriv.h"
|
| -#include "GrTracing.h"
|
| -#include "GrVertices.h"
|
| -#include "SkDashPathPriv.h"
|
| +
|
| #include "SkConfig8888.h"
|
| #include "SkGrPriv.h"
|
| -#include "SkRRect.h"
|
| -#include "SkStrokeRec.h"
|
| -#include "SkSurfacePriv.h"
|
| -#include "SkTLazy.h"
|
| -#include "SkTLS.h"
|
| -#include "SkTraceEvent.h"
|
| -#include "SkTTopoSort.h"
|
| -
|
| -#include "batches/GrBatch.h"
|
|
|
| #include "effects/GrConfigConversionEffect.h"
|
| -#include "effects/GrDashingEffect.h"
|
| -#include "effects/GrSingleTextureEffect.h"
|
|
|
| #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
|
| #define RETURN_IF_ABANDONED if (fDrawingManager->abandoned()) { return; }
|
| #define RETURN_FALSE_IF_ABANDONED if (fDrawingManager->abandoned()) { return false; }
|
| #define RETURN_NULL_IF_ABANDONED if (fDrawingManager->abandoned()) { return nullptr; }
|
|
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -
|
| -void GrDrawingManager::cleanup() {
|
| - for (int i = 0; i < fDrawTargets.count(); ++i) {
|
| - fDrawTargets[i]->unref();
|
| - }
|
| -
|
| - fDrawTargets.reset();
|
| -
|
| - delete fNVPRTextContext;
|
| - fNVPRTextContext = nullptr;
|
| -
|
| - for (int i = 0; i < kNumPixelGeometries; ++i) {
|
| - delete fTextContexts[i][0];
|
| - fTextContexts[i][0] = nullptr;
|
| - delete fTextContexts[i][1];
|
| - fTextContexts[i][1] = nullptr;
|
| - }
|
| -}
|
| -
|
| -GrDrawingManager::~GrDrawingManager() {
|
| - this->cleanup();
|
| -}
|
| -
|
| -void GrDrawingManager::abandon() {
|
| - fAbandoned = true;
|
| - this->cleanup();
|
| -}
|
| -
|
| -void GrDrawingManager::reset() {
|
| - for (int i = 0; i < fDrawTargets.count(); ++i) {
|
| - fDrawTargets[i]->reset();
|
| - }
|
| -}
|
| -
|
| -void GrDrawingManager::flush() {
|
| - SkDEBUGCODE(bool result =)
|
| - SkTTopoSort<GrDrawTarget, GrDrawTarget::TopoSortTraits>(&fDrawTargets);
|
| - SkASSERT(result);
|
| -
|
| - for (int i = 0; i < fDrawTargets.count(); ++i) {
|
| - //SkDEBUGCODE(fDrawTargets[i]->dump();)
|
| - fDrawTargets[i]->flush();
|
| - }
|
| -
|
| -#ifndef ENABLE_MDB
|
| - // When MDB is disabled we keep reusing the same drawTarget
|
| - if (fDrawTargets.count()) {
|
| - SkASSERT(fDrawTargets.count() == 1);
|
| - fDrawTargets[0]->resetFlag(GrDrawTarget::kWasOutput_Flag);
|
| - }
|
| -#endif
|
| -}
|
| -
|
| -GrTextContext* GrDrawingManager::textContext(const SkSurfaceProps& props,
|
| - GrRenderTarget* rt) {
|
| - if (this->abandoned()) {
|
| - return nullptr;
|
| - }
|
| -
|
| - SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
|
| - bool useDIF = props.isUseDeviceIndependentFonts();
|
| -
|
| - if (useDIF && fContext->caps()->shaderCaps()->pathRenderingSupport() &&
|
| - rt->isStencilBufferMultisampled()) {
|
| - GrStencilAttachment* sb = fContext->resourceProvider()->attachStencilAttachment(rt);
|
| - if (sb) {
|
| - if (!fNVPRTextContext) {
|
| - fNVPRTextContext = GrStencilAndCoverTextContext::Create(fContext, props);
|
| - }
|
| -
|
| - return fNVPRTextContext;
|
| - }
|
| - }
|
| -
|
| - if (!fTextContexts[props.pixelGeometry()][useDIF]) {
|
| - fTextContexts[props.pixelGeometry()][useDIF] = GrAtlasTextContext::Create(fContext, props);
|
| - }
|
| -
|
| - return fTextContexts[props.pixelGeometry()][useDIF];
|
| -}
|
| -
|
| -GrDrawTarget* GrDrawingManager::newDrawTarget(GrRenderTarget* rt) {
|
| - SkASSERT(fContext);
|
| -
|
| -#ifndef ENABLE_MDB
|
| - // When MDB is disabled we always just return the single drawTarget
|
| - if (fDrawTargets.count()) {
|
| - SkASSERT(fDrawTargets.count() == 1);
|
| - // DrawingManager gets the creation ref - this ref is for the caller
|
| - return SkRef(fDrawTargets[0]);
|
| - }
|
| -#endif
|
| -
|
| - GrDrawTarget* dt = new GrDrawTarget(fContext->getGpu(), fContext->resourceProvider());
|
| -
|
| - *fDrawTargets.append() = dt;
|
| -
|
| - // DrawingManager gets the creation ref - this ref is for the caller
|
| - return SkRef(dt);
|
| -}
|
| -
|
| -GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
|
| - const SkSurfaceProps* surfaceProps) {
|
| - if (this->abandoned()) {
|
| - return nullptr;
|
| - }
|
| -
|
| - return new GrDrawContext(this, rt, surfaceProps);
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| -
|
| GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) {
|
| GrContextOptions defaultOptions;
|
| return Create(backend, backendContext, defaultOptions);
|
|
|