Rename outputView->writeView and outputSwizzle->writeSwizzle
Change-Id: Ib09550201bc1556e04555fc7dc9408ab469684a0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/280964
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp
index 7a02e1a..1c64c92 100644
--- a/bench/VertexColorSpaceBench.cpp
+++ b/bench/VertexColorSpaceBench.cpp
@@ -173,14 +173,14 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp = GP::Make(arena, fMode, fColorSpaceXform);
fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps,
arena,
- outputView,
+ writeView,
std::move(appliedClip),
dstProxyView,
gp,
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index bff863c..e61e0f3 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -93,7 +93,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
auto gp = this->makeGP(*caps, arena);
@@ -103,7 +103,7 @@
GrPipeline::InputFlags flags = GrPipeline::InputFlags::kNone;
- fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, outputView,
+ fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip),
dstProxyView, gp,
std::move(fProcessorSet),
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index a429685..01ac28a 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -163,12 +163,12 @@
GrProgramInfo* createProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) const {
GrGeometryProcessor* geomProc = ClockwiseTestProcessor::Make(arena, fReadSkFragCoord);
- return sk_gpu_test::CreateProgramInfo(caps, arena, outputView,
+ return sk_gpu_test::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
geomProc, SkBlendMode::kPlus,
GrPrimitiveType::kTriangleStrip);
@@ -177,13 +177,13 @@
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
return this->createProgramInfo(&flushState->caps(),
flushState->allocator(),
- flushState->outputView(),
+ flushState->writeView(),
flushState->detachAppliedClip(),
flushState->dstProxyView());
}
void onPrePrepare(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) final {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
@@ -191,7 +191,7 @@
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip();
- fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, outputView,
+ fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView,
std::move(appliedClip), dstProxyView);
context->priv().recordProgramInfo(fProgramInfo);
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
index 70bd885..e8b2c5e 100644
--- a/gm/fwidth_squircle.cpp
+++ b/gm/fwidth_squircle.cpp
@@ -171,12 +171,12 @@
GrProgramInfo* createProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) const {
GrGeometryProcessor* geomProc = FwidthSquircleTestProcessor::Make(arena, fViewMatrix);
- return sk_gpu_test::CreateProgramInfo(caps, arena, outputView,
+ return sk_gpu_test::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
geomProc, SkBlendMode::kSrcOver,
GrPrimitiveType::kTriangleStrip);
@@ -185,13 +185,13 @@
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
return this->createProgramInfo(&flushState->caps(),
flushState->allocator(),
- flushState->outputView(),
+ flushState->writeView(),
flushState->detachAppliedClip(),
flushState->dstProxyView());
}
void onPrePrepare(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) final {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
@@ -199,7 +199,7 @@
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip();
- fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, outputView,
+ fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView,
std::move(appliedClip), dstProxyView);
context->priv().recordProgramInfo(fProgramInfo);
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index 413ff52..d72aa9a 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -244,14 +244,14 @@
GrProgramInfo* createProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) const {
GrGeometryProcessor* geomProc = SampleLocationsTestProcessor::Make(arena, fGradType);
GrPipeline::InputFlags flags = GrPipeline::InputFlags::kHWAntialias;
- return sk_gpu_test::CreateProgramInfo(caps, arena, outputView,
+ return sk_gpu_test::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
geomProc, SkBlendMode::kSrcOver,
GrPrimitiveType::kTriangleStrip,
@@ -261,13 +261,13 @@
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
return this->createProgramInfo(&flushState->caps(),
flushState->allocator(),
- flushState->outputView(),
+ flushState->writeView(),
flushState->detachAppliedClip(),
flushState->dstProxyView());
}
void onPrePrepare(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) final {
// We're going to create the GrProgramInfo (and the GrPipeline and geometry processor
@@ -277,7 +277,7 @@
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip();
- fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, outputView,
+ fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView,
std::move(appliedClip), dstProxyView);
context->priv().recordProgramInfo(fProgramInfo);
diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp
index 176f8cc..6a39c3d 100644
--- a/gm/tessellation.cpp
+++ b/gm/tessellation.cpp
@@ -299,7 +299,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
@@ -331,7 +331,7 @@
}
GrProgramInfo programInfo(state->proxy()->numSamples(), state->proxy()->numStencilSamples(),
- state->proxy()->backendFormat(), state->outputView()->origin(),
+ state->proxy()->backendFormat(), state->writeView()->origin(),
&pipeline, shader.get(), GrPrimitiveType::kPatches,
tessellationPatchVertexCount);
diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index ece956b..3e5eacb 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -99,7 +99,7 @@
return GrProcessorSet::EmptySetAnalysis();
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
void onPrepare(GrOpFlushState*) override {}
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index f26f8f3..f45baa0 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -179,10 +179,10 @@
GrSwizzle writeSwizzle = caps->getWriteSwizzle(fCharacterization.backendFormat(), grColorType);
GrSurfaceProxyView readView(proxy, fCharacterization.origin(), readSwizzle);
- GrSurfaceProxyView outputView(std::move(proxy), fCharacterization.origin(), writeSwizzle);
+ GrSurfaceProxyView writeView(std::move(proxy), fCharacterization.origin(), writeSwizzle);
auto rtc = std::make_unique<GrRenderTargetContext>(fContext.get(), std::move(readView),
- std::move(outputView), grColorType,
+ std::move(writeView), grColorType,
fCharacterization.refColorSpace(),
&fCharacterization.surfaceProps());
fSurface = SkSurface_Gpu::MakeWrappedRenderTarget(fContext.get(), std::move(rtc));
diff --git a/src/gpu/GrOpFlushState.cpp b/src/gpu/GrOpFlushState.cpp
index 67a56b8..5d004d4 100644
--- a/src/gpu/GrOpFlushState.cpp
+++ b/src/gpu/GrOpFlushState.cpp
@@ -46,7 +46,7 @@
GrProgramInfo programInfo(this->proxy()->numSamples(),
this->proxy()->numStencilSamples(),
this->proxy()->backendFormat(),
- this->outputView()->origin(),
+ this->writeView()->origin(),
pipeline,
fCurrDraw->fGeometryProcessor,
fCurrDraw->fPrimitiveType);
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index 2e72bae..39516a3 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -72,7 +72,7 @@
GrSwizzle writeSwizzle() const { return fSurfaceView->swizzle(); }
GrOp* op() { return fOp; }
- const GrSurfaceProxyView* outputView() const { return fSurfaceView; }
+ const GrSurfaceProxyView* writeView() const { return fSurfaceView; }
GrRenderTargetProxy* proxy() const { return fRenderTargetProxy; }
GrAppliedClip* appliedClip() { return fAppliedClip; }
const GrAppliedClip* appliedClip() const { return fAppliedClip; }
@@ -132,7 +132,7 @@
int* actualIndexCount) final;
void putBackIndices(int indexCount) final;
void putBackVertices(int vertices, size_t vertexStride) final;
- const GrSurfaceProxyView* outputView() const final { return this->drawOpArgs().outputView(); }
+ const GrSurfaceProxyView* writeView() const final { return this->drawOpArgs().writeView(); }
GrRenderTargetProxy* proxy() const final { return this->drawOpArgs().proxy(); }
const GrAppliedClip* appliedClip() const final { return this->drawOpArgs().appliedClip(); }
const GrAppliedHardClip& appliedHardClip() const {
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index a2f5e6e..2eadfcc 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -151,13 +151,13 @@
const GrBackendFormat& format = proxy->backendFormat();
GrSwizzle readSwizzle = context->priv().caps()->getReadSwizzle(format, colorType);
- GrSwizzle outSwizzle = context->priv().caps()->getWriteSwizzle(format, colorType);
+ GrSwizzle writeSwizzle = context->priv().caps()->getWriteSwizzle(format, colorType);
GrSurfaceProxyView readView(proxy, origin, readSwizzle);
- GrSurfaceProxyView outputView(std::move(proxy), origin, outSwizzle);
+ GrSurfaceProxyView writeView(std::move(proxy), origin, writeSwizzle);
return std::make_unique<GrRenderTargetContext>(context, std::move(readView),
- std::move(outputView), colorType,
+ std::move(writeView), colorType,
std::move(colorSpace), surfaceProps, managedOps);
}
@@ -346,19 +346,19 @@
// when the renderTargetContext attempts to use it (via getOpsTask).
GrRenderTargetContext::GrRenderTargetContext(GrRecordingContext* context,
GrSurfaceProxyView readView,
- GrSurfaceProxyView outputView,
+ GrSurfaceProxyView writeView,
GrColorType colorType,
sk_sp<SkColorSpace> colorSpace,
const SkSurfaceProps* surfaceProps,
bool managedOpsTask)
: GrSurfaceContext(context, std::move(readView), colorType, kPremul_SkAlphaType,
std::move(colorSpace))
- , fOutputView(std::move(outputView))
+ , fWriteView(std::move(writeView))
, fOpsTask(sk_ref_sp(this->asSurfaceProxy()->getLastOpsTask()))
, fSurfaceProps(SkSurfacePropsCopyOrDefault(surfaceProps))
, fManagedOpsTask(managedOpsTask) {
- SkASSERT(this->asSurfaceProxy() == fOutputView.proxy());
- SkASSERT(this->origin() == fOutputView.origin());
+ SkASSERT(this->asSurfaceProxy() == fWriteView.proxy());
+ SkASSERT(this->origin() == fWriteView.origin());
fTextTarget.reset(new TextTarget(this));
SkDEBUGCODE(this->validate();)
@@ -367,7 +367,7 @@
#ifdef SK_DEBUG
void GrRenderTargetContext::onValidate() const {
if (fOpsTask && !fOpsTask->isClosed()) {
- SkASSERT(fOutputView.proxy()->getLastRenderTask() == fOpsTask.get());
+ SkASSERT(fWriteView.proxy()->getLastRenderTask() == fOpsTask.get());
}
}
#endif
@@ -401,7 +401,7 @@
if (!fOpsTask || fOpsTask->isClosed()) {
sk_sp<GrOpsTask> newOpsTask =
- this->drawingManager()->newOpsTask(this->outputSurfaceView(), fManagedOpsTask);
+ this->drawingManager()->newOpsTask(this->writeSurfaceView(), fManagedOpsTask);
if (fOpsTask && fNumStencilSamples > 0) {
// Store the stencil values in memory upon completion of fOpsTask.
fOpsTask->setMustPreserveStencil();
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index 6befa9e..2806384 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -130,7 +130,7 @@
const SkSurfaceProps*);
GrRenderTargetContext(GrRecordingContext*, GrSurfaceProxyView readView,
- GrSurfaceProxyView outputView, GrColorType, sk_sp<SkColorSpace>,
+ GrSurfaceProxyView writeView, GrColorType, sk_sp<SkColorSpace>,
const SkSurfaceProps*, bool managedOpsTask = true);
~GrRenderTargetContext() override;
@@ -561,7 +561,7 @@
// TODO: See if it makes sense for this to return a const& instead and require the callers to
// make a copy (which refs the proxy) if needed.
- GrSurfaceProxyView outputSurfaceView() { return fOutputView; }
+ GrSurfaceProxyView writeSurfaceView() { return fWriteView; }
// This entry point should only be called if the backing GPU object is known to be
// instantiated.
@@ -694,7 +694,7 @@
std::unique_ptr<GrTextTarget> fTextTarget;
- GrSurfaceProxyView fOutputView;
+ GrSurfaceProxyView fWriteView;
// In MDB-mode the GrOpsTask can be closed by some other renderTargetContext that has picked
// it up. For this reason, the GrOpsTask should only ever be accessed via 'getOpsTask'.
diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index 3e4edaf..a43b9cb 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -45,13 +45,13 @@
std::unique_ptr<GrSurfaceContext> surfaceContext;
if (proxy->asRenderTargetProxy()) {
SkASSERT(kPremul_SkAlphaType == alphaType || kOpaque_SkAlphaType == alphaType);
- // Will we ever want a swizzle that is not the default output swizzle for the format and
+ // Will we ever want a swizzle that is not the default write swizzle for the format and
// colorType here? If so we will need to manually pass that in.
- GrSwizzle outSwizzle =
+ GrSwizzle writeSwizzle =
context->priv().caps()->getWriteSwizzle(proxy->backendFormat(), colorType);
- GrSurfaceProxyView outputView(readView.refProxy(), readView.origin(), outSwizzle);
+ GrSurfaceProxyView writeView(readView.refProxy(), readView.origin(), writeSwizzle);
surfaceContext.reset(new GrRenderTargetContext(context, std::move(readView),
- std::move(outputView), colorType,
+ std::move(writeView), colorType,
std::move(colorSpace), nullptr));
} else {
surfaceContext.reset(new GrSurfaceContext(context, std::move(readView), colorType,
diff --git a/src/gpu/ccpr/GrCCCoverageProcessor.cpp b/src/gpu/ccpr/GrCCCoverageProcessor.cpp
index cfd49ff..0426210 100644
--- a/src/gpu/ccpr/GrCCCoverageProcessor.cpp
+++ b/src/gpu/ccpr/GrCCCoverageProcessor.cpp
@@ -200,7 +200,7 @@
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
flushState->proxy()->numStencilSamples(),
flushState->proxy()->backendFormat(),
- flushState->outputView()->origin(), &pipeline, this,
+ flushState->writeView()->origin(), &pipeline, this,
this->primType());
flushState->bindPipeline(programInfo, drawBounds);
}
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.h b/src/gpu/ccpr/GrCCDrawPathsOp.h
index 644f09c..bc22738 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.h
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.h
@@ -72,7 +72,7 @@
private:
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
diff --git a/src/gpu/ccpr/GrCCPathProcessor.cpp b/src/gpu/ccpr/GrCCPathProcessor.cpp
index 33e0645..ca34af6 100644
--- a/src/gpu/ccpr/GrCCPathProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPathProcessor.cpp
@@ -137,7 +137,7 @@
GrRenderTargetProxy* rtProxy = flushState->proxy();
GrProgramInfo programInfo(rtProxy->numSamples(), rtProxy->numStencilSamples(),
- rtProxy->backendFormat(), flushState->outputView()->origin(),
+ rtProxy->backendFormat(), flushState->writeView()->origin(),
&pipeline, this, primitiveType);
flushState->bindPipelineAndScissorClip(programInfo, bounds);
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index 184acc1..493de28 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -59,7 +59,7 @@
private:
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) final {}
void onPrepare(GrOpFlushState*) final {}
diff --git a/src/gpu/ccpr/GrCCStroker.cpp b/src/gpu/ccpr/GrCCStroker.cpp
index 88a25f6..44f3db3 100644
--- a/src/gpu/ccpr/GrCCStroker.cpp
+++ b/src/gpu/ccpr/GrCCStroker.cpp
@@ -735,7 +735,7 @@
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
flushState->proxy()->numStencilSamples(),
flushState->proxy()->backendFormat(),
- flushState->outputView()->origin(), &pipeline, &processor,
+ flushState->writeView()->origin(), &pipeline, &processor,
GrPrimitiveType::kTriangleStrip);
flushState->bindPipeline(programInfo, SkRect::Make(drawBounds));
diff --git a/src/gpu/ccpr/GrStencilAtlasOp.cpp b/src/gpu/ccpr/GrStencilAtlasOp.cpp
index aab037a..6c0f7c0 100644
--- a/src/gpu/ccpr/GrStencilAtlasOp.cpp
+++ b/src/gpu/ccpr/GrStencilAtlasOp.cpp
@@ -151,7 +151,7 @@
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
flushState->proxy()->numStencilSamples(),
flushState->proxy()->backendFormat(),
- flushState->outputView()->origin(), &resolvePipeline, &primProc,
+ flushState->writeView()->origin(), &resolvePipeline, &primProc,
GrPrimitiveType::kTriangleStrip);
flushState->bindPipeline(programInfo, SkRect::Make(drawBoundsRect));
diff --git a/src/gpu/ccpr/GrStencilAtlasOp.h b/src/gpu/ccpr/GrStencilAtlasOp.h
index 89f1813..6981fed 100644
--- a/src/gpu/ccpr/GrStencilAtlasOp.h
+++ b/src/gpu/ccpr/GrStencilAtlasOp.h
@@ -54,7 +54,7 @@
private:
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
void onPrepare(GrOpFlushState*) override {}
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index bb35605..24920e4 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -743,7 +743,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
SkMatrix invert;
@@ -755,7 +755,7 @@
fHelper.usesLocalCoords(),
fWideColor);
- fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, outputView,
+ fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, writeView,
std::move(appliedClip),
dstProxyView, quadProcessor,
GrPrimitiveType::kTriangles);
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 08292e3..fd14dc1 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -867,15 +867,15 @@
private:
void makeLineProgramInfo(const GrCaps&, SkArenaAlloc*, const GrPipeline*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
const SkMatrix* geometryProcessorViewM,
const SkMatrix* geometryProcessorLocalM);
void makeQuadProgramInfo(const GrCaps&, SkArenaAlloc*, const GrPipeline*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
const SkMatrix* geometryProcessorViewM,
const SkMatrix* geometryProcessorLocalM);
void makeConicProgramInfo(const GrCaps&, SkArenaAlloc*, const GrPipeline*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
const SkMatrix* geometryProcessorViewM,
const SkMatrix* geometryProcessorLocalM);
@@ -890,12 +890,12 @@
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override;
void onPrePrepareDraws(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override;
@@ -971,7 +971,7 @@
void AAHairlineOp::makeLineProgramInfo(const GrCaps& caps, SkArenaAlloc* arena,
const GrPipeline* pipeline,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
const SkMatrix* geometryProcessorViewM,
const SkMatrix* geometryProcessorLocalM) {
if (fProgramInfos[0]) {
@@ -995,14 +995,13 @@
SkASSERT(sizeof(LineVertex) == lineGP->vertexStride());
}
- fProgramInfos[0] = GrSimpleMeshDrawOpHelper::CreateProgramInfo(arena, pipeline,
- outputView, lineGP,
+ fProgramInfos[0] = GrSimpleMeshDrawOpHelper::CreateProgramInfo(arena, pipeline, writeView, lineGP,
GrPrimitiveType::kTriangles);
}
void AAHairlineOp::makeQuadProgramInfo(const GrCaps& caps, SkArenaAlloc* arena,
const GrPipeline* pipeline,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
const SkMatrix* geometryProcessorViewM,
const SkMatrix* geometryProcessorLocalM) {
if (fProgramInfos[1]) {
@@ -1019,14 +1018,13 @@
this->coverage());
SkASSERT(sizeof(BezierVertex) == quadGP->vertexStride());
- fProgramInfos[1] = GrSimpleMeshDrawOpHelper::CreateProgramInfo(arena, pipeline,
- outputView, quadGP,
+ fProgramInfos[1] = GrSimpleMeshDrawOpHelper::CreateProgramInfo(arena, pipeline, writeView, quadGP,
GrPrimitiveType::kTriangles);
}
void AAHairlineOp::makeConicProgramInfo(const GrCaps& caps, SkArenaAlloc* arena,
const GrPipeline* pipeline,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
const SkMatrix* geometryProcessorViewM,
const SkMatrix* geometryProcessorLocalM) {
if (fProgramInfos[2]) {
@@ -1043,8 +1041,7 @@
this->coverage());
SkASSERT(sizeof(BezierVertex) == conicGP->vertexStride());
- fProgramInfos[2] = GrSimpleMeshDrawOpHelper::CreateProgramInfo(arena, pipeline,
- outputView, conicGP,
+ fProgramInfos[2] = GrSimpleMeshDrawOpHelper::CreateProgramInfo(arena, pipeline, writeView, conicGP,
GrPrimitiveType::kTriangles);
}
@@ -1076,7 +1073,7 @@
void AAHairlineOp::onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
// Setup the viewmatrix and localmatrix for the GrGeometryProcessor.
@@ -1094,26 +1091,26 @@
geometryProcessorLocalM = &SkMatrix::I();
}
- auto pipeline = fHelper.createPipelineWithStencil(caps, arena, outputView->swizzle(),
+ auto pipeline = fHelper.createPipelineWithStencil(caps, arena, writeView->swizzle(),
std::move(appliedClip), dstProxyView);
if (fCharacterization & kLine_Program) {
- this->makeLineProgramInfo(*caps, arena, pipeline, outputView,
+ this->makeLineProgramInfo(*caps, arena, pipeline, writeView,
geometryProcessorViewM, geometryProcessorLocalM);
}
if (fCharacterization & kQuad_Program) {
- this->makeQuadProgramInfo(*caps, arena, pipeline, outputView,
+ this->makeQuadProgramInfo(*caps, arena, pipeline, writeView,
geometryProcessorViewM, geometryProcessorLocalM);
}
if (fCharacterization & kConic_Program) {
- this->makeConicProgramInfo(*caps, arena, pipeline, outputView,
+ this->makeConicProgramInfo(*caps, arena, pipeline, writeView,
geometryProcessorViewM, geometryProcessorLocalM);
}
}
void AAHairlineOp::onPrePrepareDraws(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
@@ -1125,7 +1122,7 @@
// Conservatively predict which programs will be required
fCharacterization = this->predictPrograms(caps);
- this->createProgramInfo(caps, arena, outputView, std::move(appliedClip), dstProxyView);
+ this->createProgramInfo(caps, arena, writeView, std::move(appliedClip), dstProxyView);
context->priv().recordProgramInfo(fProgramInfos[0]);
context->priv().recordProgramInfo(fProgramInfos[1]);
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index 9738f72..9694e1b 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -208,7 +208,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp = create_lines_only_gp(arena,
@@ -221,7 +221,7 @@
return;
}
- fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, outputView,
+ fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
gp, GrPrimitiveType::kTriangles);
}
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 6add30b..757ed1f 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -116,14 +116,14 @@
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override {
// TODO [PI]: implement
}
void onPrePrepareDraws(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {
// TODO [PI]: implement
diff --git a/src/gpu/ops/GrClearOp.h b/src/gpu/ops/GrClearOp.h
index ea22a6a..fbac02f 100644
--- a/src/gpu/ops/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
@@ -92,7 +92,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index b5810d0..68f825a 100644
--- a/src/gpu/ops/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
@@ -55,7 +55,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index cf91ecf..56f83ca 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -330,7 +330,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
@@ -365,7 +365,7 @@
fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps,
arena,
- outputView,
+ writeView,
std::move(appliedClip),
dstProxyView,
gp,
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index bd74221..332560c 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -430,7 +430,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp;
@@ -449,7 +449,7 @@
SkASSERT(gp->vertexStride() == sizeof(SkPoint));
- fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, outputView,
+ fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, writeView,
std::move(appliedClip),
dstProxyView, gp, this->primType());
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index f5a2a5b..186ced5 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -57,7 +57,7 @@
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override;
@@ -200,7 +200,7 @@
void DrawAtlasOp::onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
// Setup geometry processor
@@ -209,7 +209,7 @@
this->color(),
this->viewMatrix());
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index 1c3f7cc..4da6756 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -93,7 +93,7 @@
GrProgramInfo programInfo(proxy->numSamples(),
proxy->numStencilSamples(),
proxy->backendFormat(),
- flushState->outputView()->origin(),
+ flushState->writeView()->origin(),
pipeline,
pathProc.get(),
GrPrimitiveType::kPath);
diff --git a/src/gpu/ops/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index b56dab3..d7f2cc2 100644
--- a/src/gpu/ops/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
@@ -55,7 +55,7 @@
private:
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) final {}
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 0c72d01..e85c864 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -295,7 +295,7 @@
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override;
@@ -453,11 +453,11 @@
void DrawVerticesOp::onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
GrGeometryProcessor* gp = this->makeGP(arena);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, this->primitiveType());
}
diff --git a/src/gpu/ops/GrDrawableOp.h b/src/gpu/ops/GrDrawableOp.h
index 828404e..6c0debe 100644
--- a/src/gpu/ops/GrDrawableOp.h
+++ b/src/gpu/ops/GrDrawableOp.h
@@ -43,7 +43,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index ca7c066..771437c 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -102,7 +102,7 @@
// Create a GrProgramInfo object in the provided arena
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) final;
@@ -863,13 +863,13 @@
void FillRRectOp::onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
GrGeometryProcessor* gp = Processor::Make(arena, fHelper.aaType(), fProcessorFlags);
SkASSERT(gp->instanceStride() == (size_t)fInstanceStride);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index 056e399..011295a 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -225,7 +225,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
const VertexSpec vertexSpec = this->vertexSpec();
@@ -233,14 +233,14 @@
GrGeometryProcessor* gp = GrQuadPerEdgeAA::MakeProcessor(arena, vertexSpec);
SkASSERT(gp->vertexStride() == vertexSpec.vertexSize());
- fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, outputView,
+ fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, writeView,
std::move(appliedClip),
dstProxyView, gp,
vertexSpec.primitiveType());
}
void onPrePrepareDraws(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
@@ -252,7 +252,7 @@
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip();
- this->createProgramInfo(context->priv().caps(), arena, outputView,
+ this->createProgramInfo(context->priv().caps(), arena, writeView,
std::move(appliedClip), dstProxyView);
context->priv().recordProgramInfo(fProgramInfo);
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 9d430f0..7efe3a3 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -216,7 +216,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
@@ -225,7 +225,7 @@
return;
}
- fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, outputView,
+ fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip),
dstProxyView, gp,
fHelper.detachProcessorSet(),
diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 54ea21b..f5a8c04 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -19,7 +19,7 @@
void GrMeshDrawOp::createProgramInfo(Target* target) {
this->createProgramInfo(&target->caps(),
target->allocator(),
- target->outputView(),
+ target->writeView(),
target->detachAppliedClip(),
target->dstProxyView());
}
@@ -27,7 +27,7 @@
// This onPrepareDraws implementation assumes the derived Op only has a single programInfo -
// which is the majority of the cases.
void GrMeshDrawOp::onPrePrepareDraws(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
@@ -35,7 +35,7 @@
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip();
- this->createProgramInfo(context->priv().caps(), arena, outputView,
+ this->createProgramInfo(context->priv().caps(), arena, writeView,
std::move(appliedClip), dstProxyView);
// TODO: at this point we've created both the program info and desc in the recording context's
diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index da2c3be..34653be 100644
--- a/src/gpu/ops/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
@@ -38,10 +38,10 @@
void createProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
- this->onCreateProgramInfo(caps, arena, outputView, std::move(appliedClip), dstProxyView);
+ this->onCreateProgramInfo(caps, arena, writeView, std::move(appliedClip), dstProxyView);
}
void createProgramInfo(Target* target);
@@ -100,7 +100,7 @@
}
virtual void onPrePrepareDraws(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&);
@@ -110,15 +110,15 @@
// by this op.
virtual void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) = 0;
void onPrePrepare(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) final {
- this->onPrePrepareDraws(context, outputView, clip, dstProxyView);
+ this->onPrePrepareDraws(context, writeView, clip, dstProxyView);
}
void onPrepare(GrOpFlushState* state) final;
@@ -195,7 +195,7 @@
}
virtual GrRenderTargetProxy* proxy() const = 0;
- virtual const GrSurfaceProxyView* outputView() const = 0;
+ virtual const GrSurfaceProxyView* writeView() const = 0;
virtual const GrAppliedClip* appliedClip() const = 0;
virtual GrAppliedClip detachAppliedClip() = 0;
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index 95c692c..292317b 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -297,7 +297,7 @@
// TODO: the parameters to onPrePrepare mirror GrOpFlushState::OpArgs - fuse the two?
virtual void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) = 0;
virtual void onPrepare(GrOpFlushState*) = 0;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 5d2a27d..d857557 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1274,7 +1274,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
SkMatrix localMatrix;
@@ -1287,7 +1287,7 @@
fRoundCaps, fWideColor,
localMatrix);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
@@ -1638,7 +1638,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
SkMatrix localMatrix;
@@ -1651,7 +1651,7 @@
fWideColor,
localMatrix);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
@@ -1969,7 +1969,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
SkMatrix localMatrix;
@@ -1980,7 +1980,7 @@
GrGeometryProcessor* gp = EllipseGeometryProcessor::Make(arena, fStroked, fWideColor,
fUseScale, localMatrix);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
@@ -2246,14 +2246,14 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp = DIEllipseGeometryProcessor::Make(arena, fWideColor, fUseScale,
this->viewMatrix(),
this->style());
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
@@ -2644,7 +2644,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
// Invert the view matrix as a local matrix (if any other processors require coords).
@@ -2657,7 +2657,7 @@
false, false, false, false,
fWideColor, localMatrix);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
@@ -2967,7 +2967,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
SkMatrix localMatrix;
@@ -2978,7 +2978,7 @@
GrGeometryProcessor* gp = EllipseGeometryProcessor::Make(arena, fStroked, fWideColor,
fUseScale, localMatrix);
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index a121295..a37e946 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -102,7 +102,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp = make_gp(arena, fViewMatrix, fWideColor);
@@ -111,7 +111,7 @@
return;
}
- fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, outputView,
+ fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
gp, GrPrimitiveType::kTriangles);
}
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index c47c978..c09cbd7 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -544,13 +544,13 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp = GrRRectShadowGeoProc::Make(arena, fFalloffView);
SkASSERT(sizeof(CircleVertex) == gp->vertexStride());
- fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, outputView,
+ fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip),
dstProxyView, gp,
GrProcessorSet::MakeEmptySet(),
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index 95a9fb4..90b76ca 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -111,7 +111,7 @@
const GrPipeline* GrSimpleMeshDrawOpHelper::CreatePipeline(
const GrCaps* caps,
SkArenaAlloc* arena,
- GrSwizzle outputViewSwizzle,
+ GrSwizzle writeViewSwizzle,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView,
GrProcessorSet&& processorSet,
@@ -123,7 +123,7 @@
pipelineArgs.fUserStencil = stencilSettings;
pipelineArgs.fCaps = caps;
pipelineArgs.fDstProxyView = dstProxyView;
- pipelineArgs.fWriteSwizzle = outputViewSwizzle;
+ pipelineArgs.fWriteSwizzle = writeViewSwizzle;
return arena->make<GrPipeline>(pipelineArgs,
std::move(processorSet),
@@ -137,7 +137,7 @@
const GrUserStencilSettings* stencilSettings) {
return CreatePipeline(&flushState->caps(),
flushState->allocator(),
- flushState->outputView()->swizzle(),
+ flushState->writeView()->swizzle(),
flushState->detachAppliedClip(),
flushState->dstProxyView(),
std::move(processorSet),
@@ -148,7 +148,7 @@
const GrPipeline* GrSimpleMeshDrawOpHelper::createPipeline(GrOpFlushState* flushState) {
return CreatePipeline(&flushState->caps(),
flushState->allocator(),
- flushState->outputView()->swizzle(),
+ flushState->writeView()->swizzle(),
flushState->detachAppliedClip(),
flushState->dstProxyView(),
this->detachProcessorSet(),
@@ -158,7 +158,7 @@
GrProgramInfo* GrSimpleMeshDrawOpHelper::CreateProgramInfo(
const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView,
GrGeometryProcessor* geometryProcessor,
@@ -168,27 +168,27 @@
const GrUserStencilSettings* stencilSettings) {
auto pipeline = CreatePipeline(caps,
arena,
- outputView->swizzle(),
+ writeView->swizzle(),
std::move(appliedClip),
dstProxyView,
std::move(processorSet),
pipelineFlags,
stencilSettings);
- return CreateProgramInfo(arena, pipeline, outputView, geometryProcessor, primitiveType);
+ return CreateProgramInfo(arena, pipeline, writeView, geometryProcessor, primitiveType);
}
GrProgramInfo* GrSimpleMeshDrawOpHelper::CreateProgramInfo(SkArenaAlloc* arena,
const GrPipeline* pipeline,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrGeometryProcessor* geometryProcessor,
GrPrimitiveType primitiveType) {
- GrRenderTargetProxy* outputProxy = outputView->asRenderTargetProxy();
+ GrRenderTargetProxy* outputProxy = writeView->asRenderTargetProxy();
auto tmp = arena->make<GrProgramInfo>(outputProxy->numSamples(),
outputProxy->numStencilSamples(),
outputProxy->backendFormat(),
- outputView->origin(),
+ writeView->origin(),
pipeline,
geometryProcessor,
primitiveType);
@@ -198,14 +198,14 @@
GrProgramInfo* GrSimpleMeshDrawOpHelper::createProgramInfo(
const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView,
GrGeometryProcessor* gp,
GrPrimitiveType primType) {
return CreateProgramInfo(caps,
arena,
- outputView,
+ writeView,
std::move(appliedClip),
dstProxyView,
gp,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index 4d78203..d876c62 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -126,7 +126,7 @@
static const GrPipeline* CreatePipeline(
const GrCaps*,
SkArenaAlloc*,
- GrSwizzle outputViewSwizzle,
+ GrSwizzle writeViewSwizzle,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&,
GrProcessorSet&&,
@@ -142,7 +142,7 @@
static GrProgramInfo* CreateProgramInfo(SkArenaAlloc*,
const GrPipeline*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrGeometryProcessor*,
GrPrimitiveType);
@@ -151,7 +151,7 @@
// it has no dynamic state besides the scissor clip
static GrProgramInfo* CreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&,
GrGeometryProcessor*,
@@ -164,7 +164,7 @@
GrProgramInfo* createProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&,
GrGeometryProcessor*,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
index 22e4e61..1af6bdb 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
@@ -10,12 +10,12 @@
const GrPipeline* GrSimpleMeshDrawOpHelperWithStencil::createPipelineWithStencil(
const GrCaps* caps,
SkArenaAlloc* arena,
- GrSwizzle outputViewSwizzle,
+ GrSwizzle writeViewSwizzle,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
return GrSimpleMeshDrawOpHelper::CreatePipeline(caps,
arena,
- outputViewSwizzle,
+ writeViewSwizzle,
std::move(appliedClip),
dstProxyView,
this->detachProcessorSet(),
@@ -27,7 +27,7 @@
GrOpFlushState* flushState) {
return this->createPipelineWithStencil(&flushState->caps(),
flushState->allocator(),
- flushState->outputView()->swizzle(),
+ flushState->writeView()->swizzle(),
flushState->detachAppliedClip(),
flushState->dstProxyView());
}
@@ -72,14 +72,14 @@
GrProgramInfo* GrSimpleMeshDrawOpHelperWithStencil::createProgramInfoWithStencil(
const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeViewSwizzle,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView,
GrGeometryProcessor* gp,
GrPrimitiveType primType) {
return CreateProgramInfo(caps,
arena,
- outputView,
+ writeViewSwizzle,
std::move(appliedClip),
dstProxyView,
gp,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
index b5210c1..e76693a 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
@@ -24,7 +24,7 @@
const GrPipeline* createPipelineWithStencil(const GrCaps*,
SkArenaAlloc*,
- GrSwizzle outputViewSwizzle,
+ GrSwizzle writeViewSwizzle,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&);
@@ -32,7 +32,7 @@
GrProgramInfo* createProgramInfoWithStencil(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeViewSwizzle,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&,
GrGeometryProcessor*,
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 9d61a4a..cd84aec 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -318,14 +318,14 @@
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override {
// TODO [PI]: implement
}
void onPrePrepareDraws(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {
// TODO [PI]: implement
diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index 05fd585..a3c9198 100644
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@@ -57,7 +57,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index fbbd954..e3f1440 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -185,7 +185,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& clip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp;
@@ -202,7 +202,7 @@
GrPrimitiveType primType = (fStrokeWidth > 0) ? GrPrimitiveType::kTriangleStrip
: GrPrimitiveType::kLineStrip;
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(clip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(clip),
dstProxyView, gp, primType);
}
@@ -462,7 +462,7 @@
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override;
@@ -518,7 +518,7 @@
void AAStrokeRectOp::onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
@@ -534,7 +534,7 @@
fProgramInfo = fHelper.createProgramInfo(caps,
arena,
- outputView,
+ writeView,
std::move(appliedClip),
dstProxyView,
gp,
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 55c4cd9..474731d 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -625,7 +625,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
SkASSERT(fDesc);
@@ -650,13 +650,13 @@
GrPipeline::InputFlags::kHWAntialias : GrPipeline::InputFlags::kNone;
fDesc->fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(
- caps, arena, outputView, std::move(appliedClip), dstProxyView, gp,
+ caps, arena, writeView, std::move(appliedClip), dstProxyView, gp,
GrProcessorSet::MakeEmptySet(), fDesc->fVertexSpec.primitiveType(),
pipelineFlags);
}
void onPrePrepareDraws(GrRecordingContext* context,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
@@ -672,7 +672,7 @@
FillInVertices(*context->priv().caps(), this, fDesc, fDesc->fPrePreparedVertices);
// This will call onCreateProgramInfo and register the created program with the DDL.
- this->INHERITED::onPrePrepareDraws(context, outputView, clip, dstProxyView);
+ this->INHERITED::onPrePrepareDraws(context, writeView, clip, dstProxyView);
}
static void FillInVertices(const GrCaps& caps, TextureOp* texOp, Desc* desc, char* vertexData) {
diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index d1e560d..b8ab235 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -325,7 +325,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
GrGeometryProcessor* gp;
@@ -367,7 +367,7 @@
GrPrimitiveType primitiveType = TRIANGULATOR_WIREFRAME ? GrPrimitiveType::kLines
: GrPrimitiveType::kTriangles;
- fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, outputView,
+ fProgramInfo = fHelper.createProgramInfoWithStencil(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
gp, primitiveType);
}
diff --git a/src/gpu/tessellate/GrDrawAtlasPathOp.cpp b/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
index 00a3fe1..73c4bf0 100644
--- a/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
+++ b/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
@@ -141,7 +141,7 @@
}
void GrDrawAtlasPathOp::onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) {
}
@@ -178,7 +178,7 @@
SkASSERT(shader.instanceStride() == Instance::Stride(fUsesLocalCoords));
GrProgramInfo programInfo(state->proxy()->numSamples(), state->proxy()->numStencilSamples(),
- state->proxy()->backendFormat(), state->outputView()->origin(),
+ state->proxy()->backendFormat(), state->writeView()->origin(),
&pipeline, &shader, GrPrimitiveType::kTriangleStrip);
state->bindPipelineAndScissorClip(programInfo, this->bounds());
diff --git a/src/gpu/tessellate/GrDrawAtlasPathOp.h b/src/gpu/tessellate/GrDrawAtlasPathOp.h
index ad15727..b20583b 100644
--- a/src/gpu/tessellate/GrDrawAtlasPathOp.h
+++ b/src/gpu/tessellate/GrDrawAtlasPathOp.h
@@ -41,7 +41,7 @@
private:
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override;
diff --git a/src/gpu/tessellate/GrTessellatePathOp.cpp b/src/gpu/tessellate/GrTessellatePathOp.cpp
index ec94176..7ff7e98 100644
--- a/src/gpu/tessellate/GrTessellatePathOp.cpp
+++ b/src/gpu/tessellate/GrTessellatePathOp.cpp
@@ -24,7 +24,7 @@
}
void GrTessellatePathOp::onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) {
}
@@ -140,7 +140,7 @@
if (fStencilPathShader) {
SkASSERT(fPathVertexBuffer);
- GrPathShader::ProgramInfo programInfo(state->outputView(), &pipeline, fStencilPathShader);
+ GrPathShader::ProgramInfo programInfo(state->writeView(), &pipeline, fStencilPathShader);
state->bindPipelineAndScissorClip(programInfo, this->bounds());
state->bindBuffers(nullptr, nullptr, fPathVertexBuffer.get());
state->draw(fPathVertexCount, fBasePathVertex);
@@ -149,7 +149,7 @@
if (fCubicInstanceBuffer) {
// Here we treat the cubic instance buffer as tessellation patches to stencil the curves.
GrStencilCubicShader shader(fViewMatrix);
- GrPathShader::ProgramInfo programInfo(state->outputView(), &pipeline, &shader);
+ GrPathShader::ProgramInfo programInfo(state->writeView(), &pipeline, &shader);
state->bindPipelineAndScissorClip(programInfo, this->bounds());
// Bind instancedBuff as vertex.
state->bindBuffers(nullptr, nullptr, fCubicInstanceBuffer.get());
@@ -236,7 +236,7 @@
SkASSERT(!pipeline.hasStencilClip());
pipeline.setUserStencil(&kFillOrInvertStencil);
}
- GrPathShader::ProgramInfo programInfo(state->outputView(), &pipeline, fFillPathShader);
+ GrPathShader::ProgramInfo programInfo(state->writeView(), &pipeline, fFillPathShader);
state->bindPipelineAndScissorClip(programInfo, this->bounds());
state->bindTextures(*fFillPathShader, nullptr, pipeline);
state->bindBuffers(nullptr, nullptr, fPathVertexBuffer.get());
@@ -248,7 +248,7 @@
// remaining samples and reset the stencil buffer.
pipeline.setUserStencil(&kTestAndResetStencil);
GrFillCubicHullShader shader(fViewMatrix, fColor);
- GrPathShader::ProgramInfo programInfo(state->outputView(), &pipeline, &shader);
+ GrPathShader::ProgramInfo programInfo(state->writeView(), &pipeline, &shader);
state->bindPipelineAndScissorClip(programInfo, this->bounds());
state->bindTextures(shader, nullptr, pipeline);
state->bindBuffers(nullptr, fCubicInstanceBuffer.get(), nullptr);
@@ -258,7 +258,7 @@
// There is not a fill shader for the path. Just draw a bounding box.
pipeline.setUserStencil(&kTestAndResetStencil);
GrFillBoundingBoxShader shader(fViewMatrix, fColor, fPath.getBounds());
- GrPathShader::ProgramInfo programInfo(state->outputView(), &pipeline, &shader);
+ GrPathShader::ProgramInfo programInfo(state->writeView(), &pipeline, &shader);
state->bindPipelineAndScissorClip(programInfo, this->bounds());
state->bindTextures(shader, nullptr, pipeline);
state->bindBuffers(nullptr, nullptr, nullptr);
diff --git a/src/gpu/tessellate/GrTessellatePathOp.h b/src/gpu/tessellate/GrTessellatePathOp.h
index 21a853f..dd4dd6d 100644
--- a/src/gpu/tessellate/GrTessellatePathOp.h
+++ b/src/gpu/tessellate/GrTessellatePathOp.h
@@ -54,7 +54,7 @@
FixedFunctionFlags fixedFunctionFlags() const override;
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override;
void onPrepare(GrOpFlushState* state) override;
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index cdab75a..aca9926 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -220,7 +220,7 @@
GrOpFlushState flushState(gpu, resourceProvider, uploadTarget.writeableTokenTracker());
- GrSurfaceProxyView surfaceView = rtc->outputSurfaceView();
+ GrSurfaceProxyView surfaceView = rtc->writeSurfaceView();
GrOpFlushState::OpArgs opArgs(op.get(),
&surfaceView,
nullptr,
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 05a3e2f..ad78a33 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -322,7 +322,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
void onPrepare(GrOpFlushState* state) override {
@@ -465,7 +465,7 @@
hasVertexBuffer);
GrProgramInfo programInfo(fState->proxy()->numSamples(), fState->proxy()->numStencilSamples(),
- fState->proxy()->backendFormat(), fState->outputView()->origin(),
+ fState->proxy()->backendFormat(), fState->writeView()->origin(),
pipeline, mtp, primitiveType);
fState->opsRenderPass()->bindPipeline(programInfo, SkRect::MakeIWH(kImageWidth, kImageHeight));
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index faf45c7..20acef5 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -146,7 +146,7 @@
return GrProcessorSet::EmptySetAnalysis();
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
void onPrepare(GrOpFlushState*) override {}
@@ -164,7 +164,7 @@
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
flushState->proxy()->numStencilSamples(),
flushState->proxy()->backendFormat(),
- flushState->outputView()->origin(),
+ flushState->writeView()->origin(),
&pipeline,
geomProc,
GrPrimitiveType::kTriangleStrip);
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index 47e50f8..4ba74e7 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -112,7 +112,7 @@
return GrProcessorSet::EmptySetAnalysis();
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
@@ -363,7 +363,7 @@
return GrProcessorSet::EmptySetAnalysis();
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
void onPrepare(GrOpFlushState*) override {}
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index efc01bb..6a819f5 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -101,7 +101,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
using namespace GrDefaultGeoProcFactory;
@@ -118,7 +118,7 @@
return;
}
- fProgramInfo = fHelper.createProgramInfo(caps, arena, outputView, std::move(appliedClip),
+ fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, std::move(appliedClip),
dstProxyView, gp, GrPrimitiveType::kTriangles);
}
diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp
index cc45f41..78cf72e 100644
--- a/tests/OpChainTest.cpp
+++ b/tests/OpChainTest.cpp
@@ -123,7 +123,7 @@
}
void onPrePrepare(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override {}
@@ -184,7 +184,7 @@
SkASSERT(proxy);
proxy->instantiate(context->priv().resourceProvider());
- GrSwizzle outSwizzle = context->priv().caps()->getWriteSwizzle(format, GrColorType::kRGBA_8888);
+ GrSwizzle writeSwizzle = context->priv().caps()->getWriteSwizzle(format, GrColorType::kRGBA_8888);
int result[result_width()];
int validResult[result_width()];
@@ -216,7 +216,7 @@
context->priv().resourceProvider(),
&tracker);
GrOpsTask opsTask(context->priv().arenas(),
- GrSurfaceProxyView(proxy, kOrigin, outSwizzle),
+ GrSurfaceProxyView(proxy, kOrigin, writeSwizzle),
context->priv().auditTrail());
// This assumes the particular values of kRanges.
std::fill_n(result, result_width(), -1);
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 5938f5c..1bfe7e9 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -60,7 +60,7 @@
void onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) override {
class GP : public GrGeometryProcessor {
@@ -127,7 +127,7 @@
fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps,
arena,
- outputView,
+ writeView,
std::move(appliedClip),
dstProxyView,
gp,
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 5fce3aa..063c860 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -67,11 +67,11 @@
GrProgramInfo* programInfo() override { return nullptr; }
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override { return; }
void onPrePrepareDraws(GrRecordingContext*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip*,
const GrXferProcessor::DstProxyView&) override { return; }
void onPrepareDraws(Target* target) override { return; }
diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index 70f3d3b..c5be111 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -58,7 +58,7 @@
GrProgramInfo* CreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView,
GrGeometryProcessor* geomProc,
@@ -77,7 +77,7 @@
*caps, GrClampType::kAuto, &analysisColor);
SkASSERT(!analysis.requiresDstTexture());
- return GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, outputView,
+ return GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
geomProc, std::move(processors),
primitiveType, flags, stencilSettings);
diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index efcb458..44b670b 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -27,7 +27,7 @@
GrProgramInfo* CreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&,
GrGeometryProcessor*,
diff --git a/tools/gpu/TestOps.cpp b/tools/gpu/TestOps.cpp
index f575653..ff5201a 100644
--- a/tools/gpu/TestOps.cpp
+++ b/tools/gpu/TestOps.cpp
@@ -110,7 +110,7 @@
GrProgramInfo* programInfo() override { return fProgramInfo; }
void onCreateProgramInfo(const GrCaps*,
SkArenaAlloc*,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&&,
const GrXferProcessor::DstProxyView&) override;
@@ -170,12 +170,12 @@
void TestRectOp::onCreateProgramInfo(const GrCaps* caps,
SkArenaAlloc* arena,
- const GrSurfaceProxyView* outputView,
+ const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
const GrXferProcessor::DstProxyView& dstProxyView) {
fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps,
arena,
- outputView,
+ writeView,
std::move(appliedClip),
dstProxyView,
&fGP,