Switch Ops over to using GrRecordingContext
Since, by definition, the ops are created when recording, it makes sense that they should be able to make due with only the GrRecordingContext.
TBR=bsalomon@google.com
Change-Id: If64353aee30b35d0a16401f7de00954f44ed8c59
Reviewed-on: https://skia-review.googlesource.com/c/190670
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index d3324a4..3c99ed6 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -295,6 +295,9 @@
virtual GrAtlasManager* onGetAtlasManager() = 0;
+ // CONTEXT TODO: move GrDrawingManager to GrRecordingContext for real
+ GrDrawingManager* drawingManager() override;
+
sk_sp<GrContextThreadSafeProxy> fThreadSafeProxy;
private:
diff --git a/include/private/GrRecordingContext.h b/include/private/GrRecordingContext.h
index 663710f..3c29216 100644
--- a/include/private/GrRecordingContext.h
+++ b/include/private/GrRecordingContext.h
@@ -11,6 +11,7 @@
#include "GrAuditTrail.h"
#include "GrImageContext.h"
+class GrDrawingManager;
class GrOpMemoryPool;
class GrRecordingContextPriv;
@@ -29,9 +30,29 @@
void abandonContext() override;
+ // CONTEXT TODO: move GrDrawingManager to GrRecordingContext for real
+ virtual GrDrawingManager* drawingManager() = 0;
+
sk_sp<GrOpMemoryPool> refOpMemoryPool();
GrOpMemoryPool* opMemoryPool();
+ /*
+ * Create a new render target context backed by a deferred-style
+ * GrRenderTargetProxy. We guarantee that "asTextureProxy" will succeed for
+ * renderTargetContexts created via this entry point.
+ */
+ sk_sp<GrRenderTargetContext> makeDeferredRenderTargetContext(
+ const GrBackendFormat& format,
+ SkBackingFit fit,
+ int width, int height,
+ GrPixelConfig config,
+ sk_sp<SkColorSpace> colorSpace,
+ int sampleCnt = 1,
+ GrMipMapped = GrMipMapped::kNo,
+ GrSurfaceOrigin origin = kBottomLeft_GrSurfaceOrigin,
+ const SkSurfaceProps* surfaceProps = nullptr,
+ SkBudgeted = SkBudgeted::kYes);
+
GrAuditTrail* auditTrail() { return &fAuditTrail; }
GrRecordingContext* asRecordingContext() override { return this; }
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 2acf9d1..ca8969e 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -882,8 +882,9 @@
#if GR_TEST_UTILS
#include "GrRenderTargetContext.h"
+#include "GrRecordingContextPriv.h"
-std::unique_ptr<GrDrawOp> GrTextContext::createOp_TestingOnly(GrContext* context,
+std::unique_ptr<GrDrawOp> GrTextContext::createOp_TestingOnly(GrRecordingContext* context,
GrTextContext* textContext,
GrRenderTargetContext* rtc,
const SkPaint& skPaint,
@@ -892,7 +893,12 @@
const char* text,
int x,
int y) {
- auto glyphCache = context->priv().getGlyphCache();
+ auto direct = context->priv().asDirectContext();
+ if (!direct) {
+ return nullptr;
+ }
+
+ auto glyphCache = direct->priv().getGlyphCache();
static SkSurfaceProps surfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
@@ -908,7 +914,7 @@
auto glyphRunList = builder.useGlyphRunList();
sk_sp<GrTextBlob> blob;
if (!glyphRunList.empty()) {
- blob = context->priv().getTextBlobCache()->makeBlob(glyphRunList, color);
+ blob = direct->priv().getTextBlobCache()->makeBlob(glyphRunList, color);
// Use the text and textLen below, because we don't want to mess with the paint.
SkScalerContextFlags scalerContextFlags =
ComputeScalerContextFlags(rtc->colorSpaceInfo());
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 1acb131..df85d55 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -143,6 +143,10 @@
return fThreadSafeProxy;
}
+GrDrawingManager* GrContext::drawingManager() {
+ return fDrawingManager.get();
+}
+
//////////////////////////////////////////////////////////////////////////////
void GrContext::abandonContext() {
diff --git a/src/gpu/GrContextPriv.cpp b/src/gpu/GrContextPriv.cpp
index 81e9533..341d787 100644
--- a/src/gpu/GrContextPriv.cpp
+++ b/src/gpu/GrContextPriv.cpp
@@ -43,6 +43,22 @@
return fContext->refOpMemoryPool();
}
+sk_sp<GrRenderTargetContext> GrContextPriv::makeDeferredRenderTargetContext(
+ const GrBackendFormat& format,
+ SkBackingFit fit,
+ int width, int height,
+ GrPixelConfig config,
+ sk_sp<SkColorSpace> colorSpace,
+ int sampleCnt,
+ GrMipMapped mipMapped,
+ GrSurfaceOrigin origin,
+ const SkSurfaceProps* surfaceProps,
+ SkBudgeted budgeted) {
+ return fContext->makeDeferredRenderTargetContext(format, fit, width, height, config,
+ std::move(colorSpace), sampleCnt, mipMapped,
+ origin, surfaceProps, budgeted);
+}
+
sk_sp<GrSurfaceContext> GrContextPriv::makeWrappedSurfaceContext(sk_sp<GrSurfaceProxy> proxy,
sk_sp<SkColorSpace> colorSpace,
const SkSurfaceProps* props) {
@@ -669,52 +685,6 @@
fContext->fDrawingManager->copyOpListsFromDDL(ddl, newDest);
}
-sk_sp<GrRenderTargetContext> GrContextPriv::makeDeferredRenderTargetContext(
- const GrBackendFormat& format,
- SkBackingFit fit,
- int width, int height,
- GrPixelConfig config,
- sk_sp<SkColorSpace> colorSpace,
- int sampleCnt,
- GrMipMapped mipMapped,
- GrSurfaceOrigin origin,
- const SkSurfaceProps* surfaceProps,
- SkBudgeted budgeted) {
- SkASSERT(sampleCnt > 0);
- if (fContext->abandoned()) {
- return nullptr;
- }
-
- GrSurfaceDesc desc;
- desc.fFlags = kRenderTarget_GrSurfaceFlag;
- desc.fWidth = width;
- desc.fHeight = height;
- desc.fConfig = config;
- desc.fSampleCnt = sampleCnt;
-
- sk_sp<GrTextureProxy> rtp;
- if (GrMipMapped::kNo == mipMapped) {
- rtp = fContext->proxyProvider()->createProxy(format, desc, origin, fit, budgeted);
- } else {
- rtp = fContext->proxyProvider()->createMipMapProxy(format, desc, origin, budgeted);
- }
- if (!rtp) {
- return nullptr;
- }
-
- sk_sp<GrRenderTargetContext> renderTargetContext(
- fContext->fDrawingManager->makeRenderTargetContext(std::move(rtp),
- std::move(colorSpace),
- surfaceProps));
- if (!renderTargetContext) {
- return nullptr;
- }
-
- renderTargetContext->discard();
-
- return renderTargetContext;
-}
-
static inline GrPixelConfig GrPixelConfigFallback(GrPixelConfig config) {
switch (config) {
case kAlpha_8_GrPixelConfig:
diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index 982656e..301a2b3 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -56,6 +56,23 @@
sk_sp<GrOpMemoryPool> refOpMemoryPool();
GrOpMemoryPool* opMemoryPool() { return fContext->opMemoryPool(); }
+ /*
+ * Create a new render target context backed by a deferred-style
+ * GrRenderTargetProxy. We guarantee that "asTextureProxy" will succeed for
+ * renderTargetContexts created via this entry point.
+ */
+ sk_sp<GrRenderTargetContext> makeDeferredRenderTargetContext(
+ const GrBackendFormat& format,
+ SkBackingFit fit,
+ int width, int height,
+ GrPixelConfig config,
+ sk_sp<SkColorSpace> colorSpace,
+ int sampleCnt = 1,
+ GrMipMapped = GrMipMapped::kNo,
+ GrSurfaceOrigin origin = kBottomLeft_GrSurfaceOrigin,
+ const SkSurfaceProps* surfaceProps = nullptr,
+ SkBudgeted = SkBudgeted::kYes);
+
GrAuditTrail* auditTrail() { return fContext->auditTrail(); }
/**
@@ -232,22 +249,6 @@
void copyOpListsFromDDL(const SkDeferredDisplayList*, GrRenderTargetProxy* newDest);
/*
- * Create a new render target context backed by a deferred-style
- * GrRenderTargetProxy. We guarantee that "asTextureProxy" will succeed for
- * renderTargetContexts created via this entry point.
- */
- sk_sp<GrRenderTargetContext> makeDeferredRenderTargetContext(
- const GrBackendFormat& format,
- SkBackingFit fit,
- int width, int height,
- GrPixelConfig config,
- sk_sp<SkColorSpace> colorSpace,
- int sampleCnt = 1,
- GrMipMapped = GrMipMapped::kNo,
- GrSurfaceOrigin origin = kBottomLeft_GrSurfaceOrigin,
- const SkSurfaceProps* surfaceProps = nullptr,
- SkBudgeted = SkBudgeted::kYes);
- /*
* This method will attempt to create a renderTargetContext that has, at least, the number of
* channels and precision per channel as requested in 'config' (e.g., A8 and 888 can be
* converted to 8888). It may also swizzle the channels (e.g., BGRA -> RGBA).
diff --git a/src/gpu/GrDrawOpTest.cpp b/src/gpu/GrDrawOpTest.cpp
index 90c6e59..cebe297 100644
--- a/src/gpu/GrDrawOpTest.cpp
+++ b/src/gpu/GrDrawOpTest.cpp
@@ -7,15 +7,15 @@
#include "GrDrawOpTest.h"
#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
+#include "GrContext_Base.h"
+#include "GrBaseContextPriv.h"
#include "GrUserStencilSettings.h"
#include "SkRandom.h"
#include "SkTypes.h"
#if GR_TEST_UTILS
-const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext* context) {
+const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext_Base* context) {
if (context->priv().caps()->avoidStencilBuffers()) {
return &GrUserStencilSettings::kUnused;
}
diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/GrDrawOpTest.h
index 6dc9541..ba97ae7 100644
--- a/src/gpu/GrDrawOpTest.h
+++ b/src/gpu/GrDrawOpTest.h
@@ -13,8 +13,10 @@
#if GR_TEST_UTILS
+class GrContext_Base;
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
class GrRenderTargetContext;
struct GrUserStencilSettings;
class SkRandom;
@@ -24,14 +26,14 @@
/** GrDrawOp subclasses should define test factory functions using this macro. */
#define GR_DRAW_OP_TEST_DEFINE(Op) \
- std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, GrContext* context, \
- GrFSAAType fsaaType)
-#define GR_DRAW_OP_TEST_FRIEND(Op) \
- friend std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \
- GrContext* context, GrFSAAType fsaaType)
+ std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \
+ GrRecordingContext* context, GrFSAAType fsaaType)
+#define GR_DRAW_OP_TEST_FRIEND(Op) \
+ friend std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \
+ GrRecordingContext* context, GrFSAAType fsaaType)
/** Helper for op test factories to pick a random stencil state. */
-const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext*);
+const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext_Base*);
#endif
#endif
diff --git a/src/gpu/GrPathRendering_none.cpp b/src/gpu/GrPathRendering_none.cpp
index ce46ad4..542ebdc 100644
--- a/src/gpu/GrPathRendering_none.cpp
+++ b/src/gpu/GrPathRendering_none.cpp
@@ -17,6 +17,8 @@
#include "ops/GrStencilAndCoverPathRenderer.h"
#include "ops/GrStencilPathOp.h"
+class GrRecordingContext;
+
GrPathRenderer* GrStencilAndCoverPathRenderer::Create(GrResourceProvider* resourceProvider,
const GrCaps& caps) {
return nullptr;
@@ -49,7 +51,7 @@
void GrGLPathRendering::onStencilPath(const StencilPathArgs&, const GrPath*) {}
-std::unique_ptr<GrOp> GrStencilPathOp::Make(GrContext*,
+std::unique_ptr<GrOp> GrStencilPathOp::Make(GrRecordingContext*,
const SkMatrix&,
bool,
GrPathRendering::FillType,
diff --git a/src/gpu/GrRecordingContext.cpp b/src/gpu/GrRecordingContext.cpp
index c719101..12142c3 100644
--- a/src/gpu/GrRecordingContext.cpp
+++ b/src/gpu/GrRecordingContext.cpp
@@ -8,8 +8,11 @@
#include "GrRecordingContext.h"
#include "GrCaps.h"
+#include "GrDrawingManager.h"
#include "GrMemoryPool.h"
+#include "GrProxyProvider.h"
#include "GrRecordingContextPriv.h"
+#include "GrRenderTargetContext.h"
#include "GrSkSLFPFactoryCache.h"
GrRecordingContext::GrRecordingContext(GrBackendApi backend,
@@ -40,6 +43,53 @@
return this->refOpMemoryPool().get();
}
+sk_sp<GrRenderTargetContext> GrRecordingContext::makeDeferredRenderTargetContext(
+ const GrBackendFormat& format,
+ SkBackingFit fit,
+ int width, int height,
+ GrPixelConfig config,
+ sk_sp<SkColorSpace> colorSpace,
+ int sampleCnt,
+ GrMipMapped mipMapped,
+ GrSurfaceOrigin origin,
+ const SkSurfaceProps* surfaceProps,
+ SkBudgeted budgeted) {
+ SkASSERT(sampleCnt > 0);
+ if (this->abandoned()) {
+ return nullptr;
+ }
+
+ GrSurfaceDesc desc;
+ desc.fFlags = kRenderTarget_GrSurfaceFlag;
+ desc.fWidth = width;
+ desc.fHeight = height;
+ desc.fConfig = config;
+ desc.fSampleCnt = sampleCnt;
+
+ sk_sp<GrTextureProxy> rtp;
+ if (GrMipMapped::kNo == mipMapped) {
+ rtp = this->proxyProvider()->createProxy(format, desc, origin, fit, budgeted);
+ } else {
+ rtp = this->proxyProvider()->createMipMapProxy(format, desc, origin, budgeted);
+ }
+ if (!rtp) {
+ return nullptr;
+ }
+
+ // CONTEXT TODO: move GrDrawingManager to GrRecordingContext for real
+ auto drawingManager = this->drawingManager();
+
+ sk_sp<GrRenderTargetContext> renderTargetContext =
+ drawingManager->makeRenderTargetContext(std::move(rtp), std::move(colorSpace),
+ surfaceProps);
+ if (!renderTargetContext) {
+ return nullptr;
+ }
+
+ renderTargetContext->discard();
+
+ return renderTargetContext;
+}
///////////////////////////////////////////////////////////////////////////////////////////////////
sk_sp<const GrCaps> GrRecordingContextPriv::refCaps() const {
@@ -53,3 +103,19 @@
sk_sp<GrOpMemoryPool> GrRecordingContextPriv::refOpMemoryPool() {
return fContext->refOpMemoryPool();
}
+
+sk_sp<GrRenderTargetContext> GrRecordingContextPriv::makeDeferredRenderTargetContext(
+ const GrBackendFormat& format,
+ SkBackingFit fit,
+ int width, int height,
+ GrPixelConfig config,
+ sk_sp<SkColorSpace> colorSpace,
+ int sampleCnt,
+ GrMipMapped mipMapped,
+ GrSurfaceOrigin origin,
+ const SkSurfaceProps* surfaceProps,
+ SkBudgeted budgeted) {
+ return fContext->makeDeferredRenderTargetContext(format, fit, width, height, config,
+ std::move(colorSpace), sampleCnt, mipMapped,
+ origin, surfaceProps, budgeted);
+}
diff --git a/src/gpu/GrRecordingContextPriv.h b/src/gpu/GrRecordingContextPriv.h
index b0f2d32..52953d0 100644
--- a/src/gpu/GrRecordingContextPriv.h
+++ b/src/gpu/GrRecordingContextPriv.h
@@ -44,6 +44,23 @@
sk_sp<GrOpMemoryPool> refOpMemoryPool();
GrOpMemoryPool* opMemoryPool() { return fContext->opMemoryPool(); }
+ /*
+ * Create a new render target context backed by a deferred-style
+ * GrRenderTargetProxy. We guarantee that "asTextureProxy" will succeed for
+ * renderTargetContexts created via this entry point.
+ */
+ sk_sp<GrRenderTargetContext> makeDeferredRenderTargetContext(
+ const GrBackendFormat& format,
+ SkBackingFit fit,
+ int width, int height,
+ GrPixelConfig config,
+ sk_sp<SkColorSpace> colorSpace,
+ int sampleCnt = 1,
+ GrMipMapped = GrMipMapped::kNo,
+ GrSurfaceOrigin origin = kBottomLeft_GrSurfaceOrigin,
+ const SkSurfaceProps* surfaceProps = nullptr,
+ SkBudgeted = SkBudgeted::kYes);
+
GrAuditTrail* auditTrail() { return fContext->auditTrail(); }
private:
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 98537df..cb9d364 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -7,7 +7,6 @@
#include "GrAAConvexPathRenderer.h"
#include "GrCaps.h"
-#include "GrContext.h"
#include "GrDrawOpTest.h"
#include "GrGeometryProcessor.h"
#include "GrPathUtils.h"
@@ -671,7 +670,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkPath& path,
diff --git a/src/gpu/ops/GrAAFillRRectOp.cpp b/src/gpu/ops/GrAAFillRRectOp.cpp
index 464462f..17c71f6 100644
--- a/src/gpu/ops/GrAAFillRRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRRectOp.cpp
@@ -8,9 +8,11 @@
#include "GrAAFillRRectOp.h"
#include "GrCaps.h"
-#include "GrContextPriv.h"
#include "GrGpuCommandBuffer.h"
#include "GrMemoryPool.h"
+#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkRRectPriv.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLGeometryProcessor.h"
@@ -22,8 +24,8 @@
static bool can_use_hw_derivatives(const GrShaderCaps&, const SkMatrix&, const SkRRect&);
std::unique_ptr<GrAAFillRRectOp> GrAAFillRRectOp::Make(
- GrContext* ctx, const SkMatrix& viewMatrix, const SkRRect& rrect, const GrCaps& caps,
- GrPaint&& paint) {
+ GrRecordingContext* ctx, const SkMatrix& viewMatrix, const SkRRect& rrect,
+ const GrCaps& caps, GrPaint&& paint) {
if (!caps.instanceAttribSupport()) {
return nullptr;
}
diff --git a/src/gpu/ops/GrAAFillRRectOp.h b/src/gpu/ops/GrAAFillRRectOp.h
index 6e3d560..95993fa 100644
--- a/src/gpu/ops/GrAAFillRRectOp.h
+++ b/src/gpu/ops/GrAAFillRRectOp.h
@@ -10,12 +10,14 @@
#include "GrDrawOp.h"
+class GrRecordingContext;
+
class GrAAFillRRectOp : public GrDrawOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrAAFillRRectOp> Make(GrContext*, const SkMatrix&, const SkRRect&,
- const GrCaps&, GrPaint&&);
+ static std::unique_ptr<GrAAFillRRectOp> Make(GrRecordingContext*, const SkMatrix&,
+ const SkRRect&, const GrCaps&, GrPaint&&);
const char* name() const override { return "GrAAFillRRectOp"; }
FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 578eea8..877a522 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -9,7 +9,6 @@
#include "GrBuffer.h"
#include "GrCaps.h"
#include "GrClip.h"
-#include "GrContext.h"
#include "GrDefaultGeoProcFactory.h"
#include "GrDrawOpTest.h"
#include "GrOpFlushState.h"
@@ -781,7 +780,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkPath& path,
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 3d1020d..da1221b 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -7,7 +7,6 @@
#include "GrAALinearizingConvexPathRenderer.h"
#include "GrAAConvexTessellator.h"
-#include "GrContext.h"
#include "GrDefaultGeoProcFactory.h"
#include "GrDrawOpTest.h"
#include "GrGeometryProcessor.h"
@@ -120,7 +119,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkPath& path,
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index b10c637..8e231cb 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -8,10 +8,10 @@
#include "GrAtlasTextOp.h"
#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "GrResourceProvider.h"
#include "SkMathPriv.h"
#include "SkMatrixPriv.h"
@@ -24,7 +24,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-std::unique_ptr<GrAtlasTextOp> GrAtlasTextOp::MakeBitmap(GrContext* context,
+std::unique_ptr<GrAtlasTextOp> GrAtlasTextOp::MakeBitmap(GrRecordingContext* context,
GrPaint&& paint,
GrMaskFormat maskFormat,
int glyphCount,
@@ -52,7 +52,7 @@
}
std::unique_ptr<GrAtlasTextOp> GrAtlasTextOp::MakeDistanceField(
- GrContext* context,
+ GrRecordingContext* context,
GrPaint&& paint,
int glyphCount,
const GrDistanceFieldAdjustTable* distanceAdjustTable,
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 5faf5fa..d8d453a 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -12,8 +12,8 @@
#include "text/GrTextBlob.h"
#include "text/GrDistanceFieldAdjustTable.h"
+class GrRecordingContext;
class SkAtlasTextTarget;
-class GrContext;
class GrAtlasTextOp final : public GrMeshDrawOp {
public:
@@ -40,20 +40,20 @@
SkPMColor4f fColor;
};
- static std::unique_ptr<GrAtlasTextOp> MakeBitmap(GrContext* context,
- GrPaint&& paint,
- GrMaskFormat maskFormat,
+ static std::unique_ptr<GrAtlasTextOp> MakeBitmap(GrRecordingContext*,
+ GrPaint&&,
+ GrMaskFormat,
int glyphCount,
bool needsTransform);
static std::unique_ptr<GrAtlasTextOp> MakeDistanceField(
- GrContext* context,
- GrPaint&& paint,
+ GrRecordingContext*,
+ GrPaint&&,
int glyphCount,
- const GrDistanceFieldAdjustTable* distanceAdjustTable,
+ const GrDistanceFieldAdjustTable*,
bool useGammaCorrectDistanceTable,
SkColor luminanceColor,
- const SkSurfaceProps& props,
+ const SkSurfaceProps&,
bool isAntiAliased,
bool useLCD);
diff --git a/src/gpu/ops/GrClearOp.cpp b/src/gpu/ops/GrClearOp.cpp
index d0ee441..9fa0091 100644
--- a/src/gpu/ops/GrClearOp.cpp
+++ b/src/gpu/ops/GrClearOp.cpp
@@ -11,8 +11,10 @@
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
#include "GrProxyProvider.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
-std::unique_ptr<GrClearOp> GrClearOp::Make(GrContext* context,
+std::unique_ptr<GrClearOp> GrClearOp::Make(GrRecordingContext* context,
const GrFixedClip& clip,
const SkPMColor4f& color,
GrSurfaceProxy* dstProxy) {
@@ -26,7 +28,7 @@
return pool->allocate<GrClearOp>(clip, color, dstProxy);
}
-std::unique_ptr<GrClearOp> GrClearOp::Make(GrContext* context,
+std::unique_ptr<GrClearOp> GrClearOp::Make(GrRecordingContext* context,
const SkIRect& rect,
const SkPMColor4f& color,
bool fullScreen) {
diff --git a/src/gpu/ops/GrClearOp.h b/src/gpu/ops/GrClearOp.h
index 89cde7b..89a9dec 100644
--- a/src/gpu/ops/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
@@ -12,17 +12,18 @@
#include "GrOp.h"
class GrOpFlushState;
+class GrRecordingContext;
class GrClearOp final : public GrOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrClearOp> Make(GrContext* context,
+ static std::unique_ptr<GrClearOp> Make(GrRecordingContext* context,
const GrFixedClip& clip,
const SkPMColor4f& color,
GrSurfaceProxy* dstProxy);
- static std::unique_ptr<GrClearOp> Make(GrContext* context,
+ static std::unique_ptr<GrClearOp> Make(GrRecordingContext* context,
const SkIRect& rect,
const SkPMColor4f& color,
bool fullScreen);
diff --git a/src/gpu/ops/GrClearStencilClipOp.cpp b/src/gpu/ops/GrClearStencilClipOp.cpp
index 99cfd5f..e050fee 100644
--- a/src/gpu/ops/GrClearStencilClipOp.cpp
+++ b/src/gpu/ops/GrClearStencilClipOp.cpp
@@ -9,8 +9,10 @@
#include "GrGpuCommandBuffer.h"
#include "GrMemoryPool.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
-std::unique_ptr<GrOp> GrClearStencilClipOp::Make(GrContext* context,
+std::unique_ptr<GrOp> GrClearStencilClipOp::Make(GrRecordingContext* context,
const GrFixedClip& clip,
bool insideStencilMask,
GrRenderTargetProxy* proxy) {
diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index a04088e..fd9733a 100644
--- a/src/gpu/ops/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
@@ -13,12 +13,13 @@
#include "GrRenderTargetProxy.h"
class GrOpFlushState;
+class GrRecordingContext;
class GrClearStencilClipOp final : public GrOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrOp> Make(GrContext* context,
+ static std::unique_ptr<GrOp> Make(GrRecordingContext* context,
const GrFixedClip& clip,
bool insideStencilMask,
GrRenderTargetProxy* proxy);
diff --git a/src/gpu/ops/GrCopySurfaceOp.cpp b/src/gpu/ops/GrCopySurfaceOp.cpp
index 8d8e9f1..3adb666 100644
--- a/src/gpu/ops/GrCopySurfaceOp.cpp
+++ b/src/gpu/ops/GrCopySurfaceOp.cpp
@@ -7,10 +7,10 @@
#include "GrCopySurfaceOp.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrGpu.h"
#include "GrMemoryPool.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
// returns true if the read/written rect intersects the src/dst and false if not.
static bool clip_src_rect_and_dst_point(const GrSurfaceProxy* dst,
@@ -63,7 +63,7 @@
return !clippedSrcRect->isEmpty();
}
-std::unique_ptr<GrOp> GrCopySurfaceOp::Make(GrContext* context,
+std::unique_ptr<GrOp> GrCopySurfaceOp::Make(GrRecordingContext* context,
GrSurfaceProxy* dstProxy,
GrSurfaceProxy* srcProxy,
const SkIRect& srcRect,
diff --git a/src/gpu/ops/GrCopySurfaceOp.h b/src/gpu/ops/GrCopySurfaceOp.h
index f17351f..eeaa237 100644
--- a/src/gpu/ops/GrCopySurfaceOp.h
+++ b/src/gpu/ops/GrCopySurfaceOp.h
@@ -11,11 +11,13 @@
#include "GrOp.h"
#include "GrOpFlushState.h"
+class GrRecordingContext;
+
class GrCopySurfaceOp final : public GrOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrOp> Make(GrContext*,
+ static std::unique_ptr<GrOp> Make(GrRecordingContext*,
GrSurfaceProxy* dst,
GrSurfaceProxy* src,
const SkIRect& srcRect,
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index e334c72..e493607 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -8,8 +8,6 @@
#include "GrDashOp.h"
#include "GrAppliedClip.h"
#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrCoordTransform.h"
#include "GrDefaultGeoProcFactory.h"
#include "GrDrawOpTest.h"
@@ -18,6 +16,8 @@
#include "GrOpFlushState.h"
#include "GrProcessor.h"
#include "GrQuad.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "GrStyle.h"
#include "GrVertexWriter.h"
#include "SkGr.h"
@@ -209,7 +209,7 @@
SkScalar fPerpendicularScale;
};
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const LineData& geometry,
SkPaint::Cap cap,
@@ -679,7 +679,7 @@
typedef GrMeshDrawOp INHERITED;
};
-std::unique_ptr<GrDrawOp> GrDashOp::MakeDashLineOp(GrContext* context,
+std::unique_ptr<GrDrawOp> GrDashOp::MakeDashLineOp(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkPoint pts[2],
diff --git a/src/gpu/ops/GrDashOp.h b/src/gpu/ops/GrDashOp.h
index eb48280..19ece56 100644
--- a/src/gpu/ops/GrDashOp.h
+++ b/src/gpu/ops/GrDashOp.h
@@ -11,9 +11,9 @@
#include "GrTypes.h"
#include "SkPathEffect.h"
-class GrContext;
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
class GrStyle;
struct GrUserStencilSettings;
@@ -25,7 +25,7 @@
};
static const int kAAModeCnt = static_cast<int>(AAMode::kCoverageWithMSAA) + 1;
-std::unique_ptr<GrDrawOp> MakeDashLineOp(GrContext*,
+std::unique_ptr<GrDrawOp> MakeDashLineOp(GrRecordingContext*,
GrPaint&&,
const SkMatrix& viewMatrix,
const SkPoint pts[2],
diff --git a/src/gpu/ops/GrDebugMarkerOp.cpp b/src/gpu/ops/GrDebugMarkerOp.cpp
index a6d06dce1..69672b5 100644
--- a/src/gpu/ops/GrDebugMarkerOp.cpp
+++ b/src/gpu/ops/GrDebugMarkerOp.cpp
@@ -8,13 +8,13 @@
#include "GrDebugMarkerOp.h"
#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrGpuCommandBuffer.h"
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
-std::unique_ptr<GrOp> GrDebugMarkerOp::Make(GrContext* context,
+std::unique_ptr<GrOp> GrDebugMarkerOp::Make(GrRecordingContext* context,
GrRenderTargetProxy* proxy,
const SkString& str) {
GrOpMemoryPool* pool = context->priv().opMemoryPool();
diff --git a/src/gpu/ops/GrDebugMarkerOp.h b/src/gpu/ops/GrDebugMarkerOp.h
index e8fc78c..998c80a 100644
--- a/src/gpu/ops/GrDebugMarkerOp.h
+++ b/src/gpu/ops/GrDebugMarkerOp.h
@@ -12,12 +12,13 @@
#include "GrRenderTargetProxy.h"
class GrOpFlushState;
+class GrRecordingContext;
class GrDebugMarkerOp final : public GrOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrOp> Make(GrContext*,
+ static std::unique_ptr<GrOp> Make(GrRecordingContext*,
GrRenderTargetProxy*,
const SkString&);
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index c8a7966..87ffadb 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -6,7 +6,6 @@
*/
#include "GrDefaultPathRenderer.h"
-#include "GrContext.h"
#include "GrDefaultGeoProcFactory.h"
#include "GrDrawOpTest.h"
#include "GrFillRectOp.h"
@@ -339,7 +338,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkPath& path,
SkScalar tolerance,
@@ -496,7 +495,7 @@
const SkMatrix& viewMatrix,
const GrShape& shape,
bool stencilOnly) {
- GrContext* context = renderTargetContext->surfPriv().getContext();
+ auto context = renderTargetContext->surfPriv().getContext();
SkASSERT(GrAAType::kCoverage != aaType);
SkPath path;
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index e1ee90c..e37e960 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -257,7 +257,7 @@
} // anonymous namespace
-std::unique_ptr<GrDrawOp> GrDrawAtlasOp::Make(GrContext* context,
+std::unique_ptr<GrDrawOp> GrDrawAtlasOp::Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
GrAAType aaType,
diff --git a/src/gpu/ops/GrDrawAtlasOp.h b/src/gpu/ops/GrDrawAtlasOp.h
index b3e6544..278ae42 100644
--- a/src/gpu/ops/GrDrawAtlasOp.h
+++ b/src/gpu/ops/GrDrawAtlasOp.h
@@ -11,13 +11,13 @@
#include "GrTypesPriv.h"
#include "SkRefCnt.h"
-class GrContext;
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
class SkMatrix;
namespace GrDrawAtlasOp {
- std::unique_ptr<GrDrawOp> Make(GrContext*,
+ std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
GrPaint&&,
const SkMatrix& viewMatrix,
GrAAType,
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index e162b05..5577c5d 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -8,6 +8,8 @@
#include "GrDrawPathOp.h"
#include "GrAppliedClip.h"
#include "GrMemoryPool.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "GrRenderTargetContext.h"
#include "GrRenderTargetPriv.h"
#include "SkTemplates.h"
@@ -63,7 +65,7 @@
//////////////////////////////////////////////////////////////////////////////
-std::unique_ptr<GrDrawOp> GrDrawPathOp::Make(GrContext* context,
+std::unique_ptr<GrDrawOp> GrDrawPathOp::Make(GrRecordingContext* context,
const SkMatrix& viewMatrix,
GrPaint&& paint,
GrAAType aaType,
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index 8f67104..e213e25 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -17,6 +17,7 @@
#include "GrStencilSettings.h"
class GrPaint;
+class GrRecordingContext;
class GrDrawPathOpBase : public GrDrawOp {
protected:
@@ -73,7 +74,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext*,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
const SkMatrix& viewMatrix,
GrPaint&&,
GrAAType,
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 315a1ec..ec82f87 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -562,7 +562,7 @@
} // anonymous namespace
-std::unique_ptr<GrDrawOp> GrDrawVerticesOp::Make(GrContext* context,
+std::unique_ptr<GrDrawOp> GrDrawVerticesOp::Make(GrRecordingContext* context,
GrPaint&& paint,
sk_sp<SkVertices> vertices,
const SkVertices::Bone bones[],
diff --git a/src/gpu/ops/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h
index 491b303..94f9de9f 100644
--- a/src/gpu/ops/GrDrawVerticesOp.h
+++ b/src/gpu/ops/GrDrawVerticesOp.h
@@ -13,9 +13,9 @@
#include "SkVertices.h"
class GrColorSpaceXform;
-class GrContext;
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
namespace GrDrawVerticesOp {
@@ -25,7 +25,7 @@
* primitive type drawn is derived from the SkVertices object, unless overridePrimType is
* specified.
*/
- std::unique_ptr<GrDrawOp> Make(GrContext*,
+ std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
GrPaint&&,
sk_sp<SkVertices>,
const SkVertices::Bone bones[],
diff --git a/src/gpu/ops/GrDrawableOp.cpp b/src/gpu/ops/GrDrawableOp.cpp
index 834fedd..1539ea4 100644
--- a/src/gpu/ops/GrDrawableOp.cpp
+++ b/src/gpu/ops/GrDrawableOp.cpp
@@ -7,15 +7,15 @@
#include "GrDrawableOp.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrGpuCommandBuffer.h"
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkDrawable.h"
std::unique_ptr<GrDrawableOp> GrDrawableOp::Make(
- GrContext* context, std::unique_ptr<SkDrawable::GpuDrawHandler> drawable,
+ GrRecordingContext* context, std::unique_ptr<SkDrawable::GpuDrawHandler> drawable,
const SkRect& bounds) {
GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDrawableOp>(std::move(drawable), bounds);
diff --git a/src/gpu/ops/GrDrawableOp.h b/src/gpu/ops/GrDrawableOp.h
index 302078b..29c4855 100644
--- a/src/gpu/ops/GrDrawableOp.h
+++ b/src/gpu/ops/GrDrawableOp.h
@@ -14,11 +14,13 @@
#include "SkDrawable.h"
#include "SkMatrix.h"
+class GrRecordingContext;
+
class GrDrawableOp final : public GrOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawableOp> Make(GrContext*,
+ static std::unique_ptr<GrDrawableOp> Make(GrRecordingContext*,
std::unique_ptr<SkDrawable::GpuDrawHandler> drawable,
const SkRect& bounds);
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index a54e0d6..bdf1a2e 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -56,7 +56,7 @@
using Helper = GrSimpleMeshDrawOpHelperWithStencil;
public:
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -164,10 +164,12 @@
private:
// For GrFillRectOp::MakeSet's use of addQuad
- friend std::unique_ptr<GrDrawOp> GrFillRectOp::MakeSet(GrContext* context, GrPaint&& paint,
- GrAAType aaType, const SkMatrix& viewMatrix,
+ friend std::unique_ptr<GrDrawOp> GrFillRectOp::MakeSet(
+ GrRecordingContext*,
+ GrPaint&&,
+ GrAAType, const SkMatrix& viewMatrix,
const GrRenderTargetContext::QuadSetEntry quads[], int quadCount,
- const GrUserStencilSettings* stencilSettings);
+ const GrUserStencilSettings*);
void onPrepareDraws(Target* target) override {
TRACE_EVENT0("skia", TRACE_FUNC);
@@ -331,7 +333,7 @@
namespace GrFillRectOp {
-std::unique_ptr<GrDrawOp> MakePerEdge(GrContext* context,
+std::unique_ptr<GrDrawOp> MakePerEdge(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -343,7 +345,7 @@
GrPerspQuad(rect, SkMatrix::I()), GrQuadType::kRect);
}
-std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalMatrix(GrContext* context,
+std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalMatrix(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -357,7 +359,7 @@
GrPerspQuad(rect, localMatrix), localQuadType);
}
-std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalRect(GrContext* context,
+std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalRect(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -370,7 +372,7 @@
GrPerspQuad(localRect, SkMatrix::I()), GrQuadType::kRect);
}
-std::unique_ptr<GrDrawOp> MakeSet(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeSet(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -405,7 +407,7 @@
return op;
}
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -416,7 +418,7 @@
viewMatrix, rect, stencil);
}
-std::unique_ptr<GrDrawOp> MakeWithLocalMatrix(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeWithLocalMatrix(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -428,7 +430,7 @@
viewMatrix, localMatrix, rect, stencil);
}
-std::unique_ptr<GrDrawOp> MakeWithLocalRect(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeWithLocalRect(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrFillRectOp.h b/src/gpu/ops/GrFillRectOp.h
index 27c6f9e..7b71830 100644
--- a/src/gpu/ops/GrFillRectOp.h
+++ b/src/gpu/ops/GrFillRectOp.h
@@ -13,6 +13,7 @@
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
struct GrUserStencilSettings;
class SkMatrix;
struct SkRect;
@@ -26,7 +27,7 @@
namespace GrFillRectOp {
// General purpose factory functions that handle per-edge anti-aliasing
-std::unique_ptr<GrDrawOp> MakePerEdge(GrContext* context,
+std::unique_ptr<GrDrawOp> MakePerEdge(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -34,7 +35,7 @@
const SkRect& rect,
const GrUserStencilSettings* stencil = nullptr);
-std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalMatrix(GrContext* context,
+std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalMatrix(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -43,7 +44,7 @@
const SkRect& rect,
const GrUserStencilSettings* stl = nullptr);
-std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalRect(GrContext* context,
+std::unique_ptr<GrDrawOp> MakePerEdgeWithLocalRect(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
GrQuadAAFlags edgeAA,
@@ -54,7 +55,7 @@
// Bulk API for drawing quads with a single op
// TODO(michaelludwig) - remove if the bulk API is not useful for SkiaRenderer
-std::unique_ptr<GrDrawOp> MakeSet(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeSet(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -64,14 +65,14 @@
// Specializations where all edges are treated the same. If the aa type is coverage, then the
// edges will be anti-aliased, otherwise per-edge AA will be disabled.
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
const SkRect& rect,
const GrUserStencilSettings* stencil = nullptr);
-std::unique_ptr<GrDrawOp> MakeWithLocalMatrix(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeWithLocalMatrix(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -79,7 +80,7 @@
const SkRect& rect,
const GrUserStencilSettings* stencil = nullptr);
-std::unique_ptr<GrDrawOp> MakeWithLocalRect(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeWithLocalRect(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 948b7db..dcb88d3 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -133,7 +133,7 @@
static const int kVertsPerRect = 4;
static const int kIndicesPerRect = 6;
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
sk_sp<GrTextureProxy> proxy,
@@ -329,7 +329,7 @@
} // anonymous namespace
namespace GrLatticeOp {
-std::unique_ptr<GrDrawOp> MakeNonAA(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeNonAA(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
sk_sp<GrTextureProxy> proxy,
@@ -343,8 +343,8 @@
};
#if GR_TEST_UTILS
-#include "GrContextPriv.h"
#include "GrProxyProvider.h"
+#include "GrRecordingContextPriv.h"
/** Randomly divides subset into count divs. */
static void init_random_divs(int divs[], int count, int subsetStart, int subsetStop,
diff --git a/src/gpu/ops/GrLatticeOp.h b/src/gpu/ops/GrLatticeOp.h
index ef723ce..cc3f301 100644
--- a/src/gpu/ops/GrLatticeOp.h
+++ b/src/gpu/ops/GrLatticeOp.h
@@ -12,17 +12,17 @@
#include "GrSamplerState.h"
#include "SkRefCnt.h"
-class GrContext;
+class GrColorSpaceXform;
class GrDrawOp;
class GrPaint;
class SkLatticeIter;
+class GrRecordingContext;
class GrTextureProxy;
-class GrColorSpaceXform;
class SkMatrix;
struct SkRect;
namespace GrLatticeOp {
-std::unique_ptr<GrDrawOp> MakeNonAA(GrContext*,
+std::unique_ptr<GrDrawOp> MakeNonAA(GrRecordingContext*,
GrPaint&&,
const SkMatrix& viewMatrix,
sk_sp<GrTextureProxy>,
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 53e776b..315455f 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -903,7 +903,7 @@
bool fUseCenter;
};
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
SkPoint center,
@@ -1359,7 +1359,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
SkPoint center,
@@ -1639,7 +1639,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& ellipse,
@@ -1867,7 +1867,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& ellipse,
@@ -2202,7 +2202,7 @@
// A devStrokeWidth <= 0 indicates a fill only. If devStrokeWidth > 0 then strokeOnly indicates
// whether the rrect is only stroked or stroked and filled.
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& devRect,
@@ -2528,7 +2528,7 @@
// If devStrokeWidths values are <= 0 indicates then fill only. Otherwise, strokeOnly indicates
// whether the rrect is only stroked or stroked and filled.
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& devRect,
@@ -2759,7 +2759,7 @@
typedef GrMeshDrawOp INHERITED;
};
-static std::unique_ptr<GrDrawOp> make_rrect_op(GrContext* context,
+static std::unique_ptr<GrDrawOp> make_rrect_op(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRRect& rrect,
@@ -2830,7 +2830,7 @@
}
}
-std::unique_ptr<GrDrawOp> GrOvalOpFactory::MakeRRectOp(GrContext* context,
+std::unique_ptr<GrDrawOp> GrOvalOpFactory::MakeRRectOp(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRRect& rrect,
@@ -2850,7 +2850,7 @@
///////////////////////////////////////////////////////////////////////////////
-std::unique_ptr<GrDrawOp> GrOvalOpFactory::MakeOvalOp(GrContext* context,
+std::unique_ptr<GrDrawOp> GrOvalOpFactory::MakeOvalOp(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& oval,
@@ -2919,7 +2919,7 @@
///////////////////////////////////////////////////////////////////////////////
-std::unique_ptr<GrDrawOp> GrOvalOpFactory::MakeArcOp(GrContext* context,
+std::unique_ptr<GrDrawOp> GrOvalOpFactory::MakeArcOp(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& oval, SkScalar startAngle,
diff --git a/src/gpu/ops/GrOvalOpFactory.h b/src/gpu/ops/GrOvalOpFactory.h
index 117d31d..b0f0034 100644
--- a/src/gpu/ops/GrOvalOpFactory.h
+++ b/src/gpu/ops/GrOvalOpFactory.h
@@ -11,9 +11,9 @@
#include "GrColor.h"
#include "SkRefCnt.h"
-class GrContext;
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
class GrShaderCaps;
class GrStyle;
class SkMatrix;
@@ -26,21 +26,21 @@
*/
class GrOvalOpFactory {
public:
- static std::unique_ptr<GrDrawOp> MakeOvalOp(GrContext*,
+ static std::unique_ptr<GrDrawOp> MakeOvalOp(GrRecordingContext*,
GrPaint&&,
const SkMatrix&,
const SkRect& oval,
const GrStyle& style,
const GrShaderCaps*);
- static std::unique_ptr<GrDrawOp> MakeRRectOp(GrContext*,
+ static std::unique_ptr<GrDrawOp> MakeRRectOp(GrRecordingContext*,
GrPaint&&,
const SkMatrix&,
const SkRRect&,
const SkStrokeRec&,
const GrShaderCaps*);
- static std::unique_ptr<GrDrawOp> MakeArcOp(GrContext*,
+ static std::unique_ptr<GrDrawOp> MakeArcOp(GrRecordingContext*,
GrPaint&&,
const SkMatrix&,
const SkRect& oval,
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index 9db1fec..c050142 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -6,8 +6,10 @@
*/
#include "GrRegionOp.h"
-#include <GrDrawOpTest.h>
+
+#include "GrCaps.h"
#include "GrDefaultGeoProcFactory.h"
+#include "GrDrawOpTest.h"
#include "GrMeshDrawOp.h"
#include "GrOpFlushState.h"
#include "GrResourceProvider.h"
@@ -38,7 +40,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRegion& region,
@@ -168,7 +170,7 @@
namespace GrRegionOp {
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRegion& region,
diff --git a/src/gpu/ops/GrRegionOp.h b/src/gpu/ops/GrRegionOp.h
index e9281f8..badea79 100644
--- a/src/gpu/ops/GrRegionOp.h
+++ b/src/gpu/ops/GrRegionOp.h
@@ -10,8 +10,8 @@
#include "GrTypesPriv.h"
-class GrContext;
class GrDrawOp;
+class GrRecordingContext;
class SkMatrix;
class SkRegion;
class GrPaint;
@@ -19,7 +19,7 @@
namespace GrRegionOp {
/** GrAAType must be kNone or kMSAA. */
-std::unique_ptr<GrDrawOp> Make(GrContext*,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
GrPaint&&,
const SkMatrix& viewMatrix,
const SkRegion&,
diff --git a/src/gpu/ops/GrSemaphoreOp.cpp b/src/gpu/ops/GrSemaphoreOp.cpp
index 7160f20..518a460 100644
--- a/src/gpu/ops/GrSemaphoreOp.cpp
+++ b/src/gpu/ops/GrSemaphoreOp.cpp
@@ -7,17 +7,17 @@
#include "GrSemaphoreOp.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrGpu.h"
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
class GrWaitSemaphoreOp final : public GrSemaphoreOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrOp> Make(GrContext* context,
+ static std::unique_ptr<GrOp> Make(GrRecordingContext* context,
sk_sp<GrSemaphore> semaphore,
GrRenderTargetProxy* proxy) {
GrOpMemoryPool* pool = context->priv().opMemoryPool();
@@ -42,7 +42,7 @@
////////////////////////////////////////////////////////////////////////////////
-std::unique_ptr<GrOp> GrSemaphoreOp::MakeWait(GrContext* context,
+std::unique_ptr<GrOp> GrSemaphoreOp::MakeWait(GrRecordingContext* context,
sk_sp<GrSemaphore> semaphore,
GrRenderTargetProxy* proxy) {
return GrWaitSemaphoreOp::Make(context, std::move(semaphore), proxy);
diff --git a/src/gpu/ops/GrSemaphoreOp.h b/src/gpu/ops/GrSemaphoreOp.h
index 9876d62..8576156 100644
--- a/src/gpu/ops/GrSemaphoreOp.h
+++ b/src/gpu/ops/GrSemaphoreOp.h
@@ -14,9 +14,11 @@
#include "GrSemaphore.h"
#include "SkRefCnt.h"
+class GrRecordingContext;
+
class GrSemaphoreOp : public GrOp {
public:
- static std::unique_ptr<GrOp> MakeWait(GrContext*,
+ static std::unique_ptr<GrOp> MakeWait(GrRecordingContext*,
sk_sp<GrSemaphore>,
GrRenderTargetProxy*);
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index dd091a3..0d99501 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -7,11 +7,11 @@
#include "GrShadowRRectOp.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrDrawOpTest.h"
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkRRectPriv.h"
#include "effects/GrShadowGeoProc.h"
@@ -620,7 +620,7 @@
///////////////////////////////////////////////////////////////////////////////
namespace GrShadowRRectOp {
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrColor color,
const SkMatrix& viewMatrix,
const SkRRect& rrect,
diff --git a/src/gpu/ops/GrShadowRRectOp.h b/src/gpu/ops/GrShadowRRectOp.h
index a4607cb..1b2052a 100644
--- a/src/gpu/ops/GrShadowRRectOp.h
+++ b/src/gpu/ops/GrShadowRRectOp.h
@@ -11,18 +11,18 @@
#include <memory>
#include "GrColor.h"
-class GrContext;
class GrDrawOp;
+class GrRecordingContext;
+
class SkMatrix;
class SkRRect;
-class SkStrokeRec;
namespace GrShadowRRectOp {
-std::unique_ptr<GrDrawOp> Make(GrContext*,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
GrColor,
const SkMatrix& viewMatrix,
- const SkRRect& rrect,
+ const SkRRect&,
SkScalar blurWidth,
SkScalar insetWidth);
}
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index 8ed33af..66b9b4c 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -8,12 +8,12 @@
#ifndef GrSimpleMeshDrawOpHelper_DEFINED
#define GrSimpleMeshDrawOpHelper_DEFINED
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrMemoryPool.h" // only here bc of the templated FactoryHelper
#include "GrMeshDrawOp.h"
#include "GrOpFlushState.h"
#include "GrPipeline.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include <new>
struct SkRect;
@@ -36,7 +36,7 @@
* which is public or made accessible via 'friend'.
*/
template <typename Op, typename... OpArgs>
- static std::unique_ptr<GrDrawOp> FactoryHelper(GrContext*, GrPaint&& paint, OpArgs... opArgs);
+ static std::unique_ptr<GrDrawOp> FactoryHelper(GrRecordingContext*, GrPaint&&, OpArgs...);
enum class Flags : uint32_t {
kNone = 0x0,
@@ -158,7 +158,7 @@
// using declarations can't be templated, so this is a pass through function instead.
template <typename Op, typename... OpArgs>
- static std::unique_ptr<GrDrawOp> FactoryHelper(GrContext* context, GrPaint&& paint,
+ static std::unique_ptr<GrDrawOp> FactoryHelper(GrRecordingContext* context, GrPaint&& paint,
OpArgs... opArgs) {
return GrSimpleMeshDrawOpHelper::FactoryHelper<Op, OpArgs...>(
context, std::move(paint), std::forward<OpArgs>(opArgs)...);
@@ -193,7 +193,7 @@
};
template <typename Op, typename... OpArgs>
-std::unique_ptr<GrDrawOp> GrSimpleMeshDrawOpHelper::FactoryHelper(GrContext* context,
+std::unique_ptr<GrDrawOp> GrSimpleMeshDrawOpHelper::FactoryHelper(GrRecordingContext* context,
GrPaint&& paint,
OpArgs... opArgs) {
GrOpMemoryPool* pool = context->priv().opMemoryPool();
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 13bdec1..eb3ee7a 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -8,7 +8,6 @@
#include "GrSmallPathRenderer.h"
#include "GrBuffer.h"
-#include "GrContext.h"
#include "GrDistanceFieldGenFromVector.h"
#include "GrDrawOpTest.h"
#include "GrQuad.h"
@@ -229,7 +228,7 @@
using ShapeCache = SkTDynamicHash<ShapeData, ShapeDataKey>;
using ShapeDataList = GrSmallPathRenderer::ShapeDataList;
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const GrShape& shape,
const SkMatrix& viewMatrix,
@@ -940,7 +939,7 @@
};
std::unique_ptr<GrDrawOp> GrSmallPathRenderer::createOp_TestingOnly(
- GrContext* context,
+ GrRecordingContext* context,
GrPaint&& paint,
const GrShape& shape,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrSmallPathRenderer.h b/src/gpu/ops/GrSmallPathRenderer.h
index c5f8eb8..d106fc0 100644
--- a/src/gpu/ops/GrSmallPathRenderer.h
+++ b/src/gpu/ops/GrSmallPathRenderer.h
@@ -17,7 +17,7 @@
#include "SkOpts.h"
#include "SkTDynamicHash.h"
-class GrContext;
+class GrRecordingContext;
class ShapeData;
class ShapeDataKey;
@@ -50,7 +50,7 @@
using ShapeCache = SkTDynamicHash<ShapeData, ShapeDataKey>;
typedef SkTInternalLList<ShapeData> ShapeDataList;
- static std::unique_ptr<GrDrawOp> createOp_TestingOnly(GrContext*,
+ static std::unique_ptr<GrDrawOp> createOp_TestingOnly(GrRecordingContext*,
GrPaint&&,
const GrShape&,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
index 16db3b3..68782d3 100644
--- a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
@@ -7,11 +7,11 @@
#include "GrStencilAndCoverPathRenderer.h"
#include "GrCaps.h"
-#include "GrContext.h"
#include "GrDrawPathOp.h"
#include "GrFixedClip.h"
#include "GrGpu.h"
#include "GrPath.h"
+#include "GrRecordingContext.h"
#include "GrRenderTargetContextPriv.h"
#include "GrResourceProvider.h"
#include "GrShape.h"
diff --git a/src/gpu/ops/GrStencilAndCoverPathRenderer.h b/src/gpu/ops/GrStencilAndCoverPathRenderer.h
index 8649be2..ed82cf6 100644
--- a/src/gpu/ops/GrStencilAndCoverPathRenderer.h
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.h
@@ -10,7 +10,6 @@
#include "GrPathRenderer.h"
-class GrContext;
class GrGpu;
class GrResourceProvider;
diff --git a/src/gpu/ops/GrStencilPathOp.cpp b/src/gpu/ops/GrStencilPathOp.cpp
index 7d913ea..ac12f5f 100644
--- a/src/gpu/ops/GrStencilPathOp.cpp
+++ b/src/gpu/ops/GrStencilPathOp.cpp
@@ -7,14 +7,14 @@
#include "GrStencilPathOp.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrGpu.h"
#include "GrMemoryPool.h"
#include "GrOpFlushState.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "GrRenderTargetPriv.h"
-std::unique_ptr<GrOp> GrStencilPathOp::Make(GrContext* context,
+std::unique_ptr<GrOp> GrStencilPathOp::Make(GrRecordingContext* context,
const SkMatrix& viewMatrix,
bool useHWAA,
GrPathRendering::FillType fillType,
diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index 9facfe9..5b7bf86 100644
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@@ -13,14 +13,14 @@
#include "GrPathRendering.h"
#include "GrStencilSettings.h"
-class GrContext;
class GrOpFlushState;
+class GrRecordingContext;
class GrStencilPathOp final : public GrOp {
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrOp> Make(GrContext* context,
+ static std::unique_ptr<GrOp> Make(GrRecordingContext* context,
const SkMatrix& viewMatrix,
bool useHWAA,
GrPathRendering::FillType fillType,
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index 30242cc..257719b 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -106,7 +106,7 @@
}
#endif
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& rect,
@@ -317,7 +317,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& devOutside,
@@ -340,7 +340,7 @@
fWideColor = !SkPMColor4fFitsInBytes(color);
}
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect& rect,
@@ -732,7 +732,7 @@
namespace GrStrokeRectOp {
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -749,7 +749,7 @@
}
}
-std::unique_ptr<GrDrawOp> MakeNested(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeNested(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect rects[2]) {
diff --git a/src/gpu/ops/GrStrokeRectOp.h b/src/gpu/ops/GrStrokeRectOp.h
index 97ea865..510579e 100644
--- a/src/gpu/ops/GrStrokeRectOp.h
+++ b/src/gpu/ops/GrStrokeRectOp.h
@@ -12,6 +12,7 @@
class GrDrawOp;
class GrPaint;
+class GrRecordingContext;
class SkMatrix;
struct SkRect;
class SkStrokeRec;
@@ -24,7 +25,7 @@
*/
namespace GrStrokeRectOp {
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -34,7 +35,7 @@
// rects[0] == outer rectangle, rects[1] == inner rectangle. Null return means there is nothing to
// draw rather than failure. The area between the rectangles will be filled by the paint, and it
// will be anti-aliased with coverage AA. viewMatrix.rectStaysRect() must be true.
-std::unique_ptr<GrDrawOp> MakeNested(GrContext* context,
+std::unique_ptr<GrDrawOp> MakeNested(GrRecordingContext* context,
GrPaint&& paint,
const SkMatrix& viewMatrix,
const SkRect rects[2]);
diff --git a/src/gpu/ops/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index c29b7bf..269f798 100644
--- a/src/gpu/ops/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -172,7 +172,7 @@
public:
DEFINE_OP_CLASS_ID
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const GrShape& shape,
const SkMatrix& viewMatrix,
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 4ebe9f6..8d44a43 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -9,8 +9,6 @@
#include <new>
#include "GrAppliedClip.h"
#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrDrawOpTest.h"
#include "GrGeometryProcessor.h"
#include "GrGpu.h"
@@ -19,6 +17,8 @@
#include "GrOpFlushState.h"
#include "GrQuad.h"
#include "GrQuadPerEdgeAA.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "GrResourceProvider.h"
#include "GrResourceProviderPriv.h"
#include "GrShaderCaps.h"
@@ -96,7 +96,7 @@
*/
class TextureOp final : public GrMeshDrawOp {
public:
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
sk_sp<GrTextureProxy> proxy,
GrSamplerState::Filter filter,
const SkPMColor4f& color,
@@ -113,7 +113,7 @@
std::move(proxy), filter, color, srcRect, dstRect, aaType, aaFlags, constraint,
viewMatrix, std::move(textureColorSpaceXform));
}
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
const GrRenderTargetContext::TextureSetEntry set[],
int cnt, GrSamplerState::Filter filter, GrAAType aaType,
const SkMatrix& viewMatrix,
@@ -535,7 +535,7 @@
namespace GrTextureOp {
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
sk_sp<GrTextureProxy> proxy,
GrSamplerState::Filter filter,
const SkPMColor4f& color,
@@ -550,7 +550,7 @@
aaFlags, constraint, viewMatrix, std::move(textureColorSpaceXform));
}
-std::unique_ptr<GrDrawOp> Make(GrContext* context,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
const GrRenderTargetContext::TextureSetEntry set[],
int cnt,
GrSamplerState::Filter filter,
@@ -587,9 +587,9 @@
} // namespace GrTextureOp
#if GR_TEST_UTILS
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrProxyProvider.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
GR_DRAW_OP_TEST_DEFINE(TextureOp) {
GrSurfaceDesc desc;
diff --git a/src/gpu/ops/GrTextureOp.h b/src/gpu/ops/GrTextureOp.h
index 1942344..75f3fce 100644
--- a/src/gpu/ops/GrTextureOp.h
+++ b/src/gpu/ops/GrTextureOp.h
@@ -27,7 +27,7 @@
* space. 'viewMatrix' must be affine. If GrAAType is kCoverage then AA is applied to the edges
* indicated by GrQuadAAFlags. Otherwise, GrQuadAAFlags is ignored.
*/
-std::unique_ptr<GrDrawOp> Make(GrContext*,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
sk_sp<GrTextureProxy>,
GrSamplerState::Filter,
const SkPMColor4f&,
@@ -39,7 +39,7 @@
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureXform);
-std::unique_ptr<GrDrawOp> Make(GrContext*,
+std::unique_ptr<GrDrawOp> Make(GrRecordingContext*,
const GrRenderTargetContext::TextureSetEntry[],
int cnt,
GrSamplerState::Filter,
diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h
index ff9043c..57c2491 100644
--- a/src/gpu/text/GrTextContext.h
+++ b/src/gpu/text/GrTextContext.h
@@ -18,6 +18,7 @@
#endif
class GrDrawOp;
+class GrRecordingContext;
class GrTextBlobCache;
class SkGlyph;
class GrTextBlob;
@@ -47,7 +48,7 @@
void drawGlyphRunList(GrContext*, GrTextTarget*, const GrClip&,
const SkMatrix& viewMatrix, const SkSurfaceProps&, const SkGlyphRunList&);
- std::unique_ptr<GrDrawOp> createOp_TestingOnly(GrContext*,
+ std::unique_ptr<GrDrawOp> createOp_TestingOnly(GrRecordingContext*,
GrTextContext*,
GrRenderTargetContext*,
const SkPaint&, const SkFont&,
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index 7830c4a..00faf49 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -34,14 +34,14 @@
DEFINE_OP_CLASS_ID
// This creates an instance of a simple non-AA solid color rect-drawing Op
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkRect& r) {
return Helper::FactoryHelper<NonAARectOp>(context, std::move(paint), r, nullptr, ClassID());
}
// This creates an instance of a simple non-AA textured rect-drawing Op
- static std::unique_ptr<GrDrawOp> Make(GrContext* context,
+ static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
GrPaint&& paint,
const SkRect& r,
const SkRect& local) {
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 6ce73a9..884b3dc 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -161,7 +161,8 @@
//////////////////////////////////////////////////////////////////////////////
#define DRAW_OP_TEST_EXTERN(Op) \
- extern std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&&, SkRandom*, GrContext*, GrFSAAType)
+ extern std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&&, SkRandom*, \
+ GrRecordingContext*, GrFSAAType)
#define DRAW_OP_TEST_ENTRY(Op) Op##__Test
DRAW_OP_TEST_EXTERN(AAConvexPathOp);
@@ -188,7 +189,8 @@
void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext, GrPaint&& paint) {
GrContext* context = renderTargetContext->surfPriv().getContext();
- using MakeDrawOpFn = std::unique_ptr<GrDrawOp>(GrPaint&&, SkRandom*, GrContext*, GrFSAAType);
+ using MakeDrawOpFn = std::unique_ptr<GrDrawOp>(GrPaint&&, SkRandom*,
+ GrRecordingContext*, GrFSAAType);
static constexpr MakeDrawOpFn* gFactories[] = {
DRAW_OP_TEST_ENTRY(AAConvexPathOp),
DRAW_OP_TEST_ENTRY(AAFlatteningConvexPathOp),
