Rename GrXferProcessor::DstProxyView to GrDstProxyView.
At present, only Xfer processors allow reading back from the destination
image since they are in charge of blending. However, we'd like to expose
the destination color to fragment processors and Runtime Effects in the
future. To make this possible, the DstProxyView will need to be
accessible outside of Xfer processors.
This CL migrates DstProxyView to be a top-level Ganesh class and fixes
up the references to it throughout Skia. It's interesting to note that
several call sites were already using typedefs to hide the class
nesting anyway.
Change-Id: I93a294aa097f9319a968503c4f2f7e4f388ff033
Bug: skia:12066
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/414899
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp
index 9f4dce2..ed7a81b 100644
--- a/bench/VertexColorSpaceBench.cpp
+++ b/bench/VertexColorSpaceBench.cpp
@@ -173,7 +173,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp = GP::Make(arena, fMode, fColorSpaceXform);
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 00e0794..2858a6e 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -91,7 +91,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
auto gp = this->makeGP(*caps, arena);
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 0958d20..a1d94c7 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -159,7 +159,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) const {
GrGeometryProcessor* geomProc = ClockwiseTestProcessor::Make(arena, fReadSkFragCoord);
@@ -184,7 +184,7 @@
void onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) final {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
index 2a997e8..c85a52b 100644
--- a/gm/fwidth_squircle.cpp
+++ b/gm/fwidth_squircle.cpp
@@ -168,7 +168,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) const {
GrGeometryProcessor* geomProc = FwidthSquircleTestProcessor::Make(arena, fViewMatrix);
@@ -193,7 +193,7 @@
void onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) final {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp
index 1fa252a..a524027 100644
--- a/gm/tessellation.cpp
+++ b/gm/tessellation.cpp
@@ -290,7 +290,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
diff --git a/samplecode/SamplePathTessellators.cpp b/samplecode/SamplePathTessellators.cpp
index 9842d21..e397840 100644
--- a/samplecode/SamplePathTessellators.cpp
+++ b/samplecode/SamplePathTessellators.cpp
@@ -63,8 +63,7 @@
nullptr, caps, clampType, &color);
}
void onPrePrepare(GrRecordingContext*, const GrSurfaceProxyView&, GrAppliedClip*,
- const GrXferProcessor::DstProxyView&, GrXferBarrierFlags,
- GrLoadOp colorLoadOp) override {}
+ const GrDstProxyView&, GrXferBarrierFlags, GrLoadOp colorLoadOp) override {}
void onPrepare(GrOpFlushState* flushState) override {
constexpr static SkPMColor4f kCyan = {0,1,1,1};
auto alloc = flushState->allocator();
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index 6ecda64..61bcb39 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -59,8 +59,7 @@
struct OpArgs {
// TODO: why does OpArgs have the op we're going to pass it to as a member? Remove it.
explicit OpArgs(GrOp* op, const GrSurfaceProxyView& surfaceView, bool usesMSAASurface,
- GrAppliedClip* appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ GrAppliedClip* appliedClip, const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers, GrLoadOp colorLoadOp)
: fOp(op)
, fSurfaceView(surfaceView)
@@ -80,7 +79,7 @@
bool usesMSAASurface() const { return fUsesMSAASurface; }
GrAppliedClip* appliedClip() { return fAppliedClip; }
const GrAppliedClip* appliedClip() const { return fAppliedClip; }
- const GrXferProcessor::DstProxyView& dstProxyView() const { return fDstProxyView; }
+ const GrDstProxyView& dstProxyView() const { return fDstProxyView; }
GrXferBarrierFlags renderPassBarriers() const { return fRenderPassXferBarriers; }
GrLoadOp colorLoadOp() const { return fColorLoadOp; }
@@ -97,7 +96,7 @@
GrRenderTargetProxy* fRenderTargetProxy;
bool fUsesMSAASurface;
GrAppliedClip* fAppliedClip;
- GrXferProcessor::DstProxyView fDstProxyView; // TODO: do we still need the dst proxy here?
+ GrDstProxyView fDstProxyView; // TODO: do we still need the dst proxy here?
GrXferBarrierFlags fRenderPassXferBarriers;
GrLoadOp fColorLoadOp;
};
@@ -163,7 +162,7 @@
fOpArgs->appliedClip()->hardClip() : GrAppliedHardClip::Disabled();
}
GrAppliedClip detachAppliedClip() final;
- const GrXferProcessor::DstProxyView& dstProxyView() const final {
+ const GrDstProxyView& dstProxyView() const final {
return this->drawOpArgs().dstProxyView();
}
diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index fd4bdf0..60df844 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -34,10 +34,6 @@
////////////////////////////////////////////////////////////////////////////////
-using DstProxyView = GrXferProcessor::DstProxyView;
-
-////////////////////////////////////////////////////////////////////////////////
-
static inline bool can_reorder(const SkRect& a, const SkRect& b) { return !GrRectsOverlap(a, b); }
////////////////////////////////////////////////////////////////////////////////
@@ -120,9 +116,8 @@
////////////////////////////////////////////////////////////////////////////////
-GrOpsTask::OpChain::OpChain(GrOp::Owner op,
- GrProcessorSet::Analysis processorAnalysis,
- GrAppliedClip* appliedClip, const DstProxyView* dstProxyView)
+GrOpsTask::OpChain::OpChain(GrOp::Owner op, GrProcessorSet::Analysis processorAnalysis,
+ GrAppliedClip* appliedClip, const GrDstProxyView* dstProxyView)
: fList{std::move(op)}
, fProcessorAnalysis(processorAnalysis)
, fAppliedClip(appliedClip) {
@@ -236,7 +231,7 @@
// Attempts to concatenate the given chain onto our own and merge ops across the chains. Returns
// whether the operation succeeded. On success, the provided list will be returned empty.
bool GrOpsTask::OpChain::tryConcat(
- List* list, GrProcessorSet::Analysis processorAnalysis, const DstProxyView& dstProxyView,
+ List* list, GrProcessorSet::Analysis processorAnalysis, const GrDstProxyView& dstProxyView,
const GrAppliedClip* appliedClip, const SkRect& bounds, const GrCaps& caps,
SkArenaAlloc* opsTaskArena, GrAuditTrail* auditTrail) {
SkASSERT(!fList.empty());
@@ -320,9 +315,9 @@
GrOp::Owner GrOpsTask::OpChain::appendOp(
GrOp::Owner op, GrProcessorSet::Analysis processorAnalysis,
- const DstProxyView* dstProxyView, const GrAppliedClip* appliedClip, const GrCaps& caps,
+ const GrDstProxyView* dstProxyView, const GrAppliedClip* appliedClip, const GrCaps& caps,
SkArenaAlloc* opsTaskArena, GrAuditTrail* auditTrail) {
- const GrXferProcessor::DstProxyView noDstProxyView;
+ const GrDstProxyView noDstProxyView;
if (!dstProxyView) {
dstProxyView = &noDstProxyView;
}
@@ -392,7 +387,7 @@
void GrOpsTask::addDrawOp(GrDrawingManager* drawingMgr, GrOp::Owner op, bool usesMSAA,
const GrProcessorSet::Analysis& processorAnalysis, GrAppliedClip&& clip,
- const DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrTextureResolveManager textureResolveManager, const GrCaps& caps) {
auto addDependency = [&](GrSurfaceProxy* p, GrMipmapped mipmapped) {
this->addSampledTexture(p);
@@ -956,7 +951,7 @@
void GrOpsTask::recordOp(
GrOp::Owner op, GrProcessorSet::Analysis processorAnalysis, GrAppliedClip* clip,
- const DstProxyView* dstProxyView, const GrCaps& caps) {
+ const GrDstProxyView* dstProxyView, const GrCaps& caps) {
SkDEBUGCODE(op->validate();)
SkASSERT(processorAnalysis.requiresDstTexture() == (dstProxyView && dstProxyView->proxy()));
GrSurfaceProxy* proxy = this->target(0);
diff --git a/src/gpu/GrOpsTask.h b/src/gpu/GrOpsTask.h
index 0d308fa..876c23e 100644
--- a/src/gpu/GrOpsTask.h
+++ b/src/gpu/GrOpsTask.h
@@ -33,9 +33,6 @@
class GrRenderTargetProxy;
class GrOpsTask : public GrRenderTask {
-private:
- using DstProxyView = GrXferProcessor::DstProxyView;
-
public:
// Manage the arenas life time by maintaining are reference to it.
GrOpsTask(GrDrawingManager*, GrSurfaceProxyView, GrAuditTrail*, sk_sp<GrArenas>);
@@ -72,7 +69,7 @@
void addOp(GrDrawingManager*, GrOp::Owner, GrTextureResolveManager, const GrCaps&);
void addDrawOp(GrDrawingManager*, GrOp::Owner, bool usesMSAA, const GrProcessorSet::Analysis&,
- GrAppliedClip&&, const DstProxyView&, GrTextureResolveManager, const GrCaps&);
+ GrAppliedClip&&, const GrDstProxyView&, GrTextureResolveManager, const GrCaps&);
void discard();
@@ -146,7 +143,7 @@
class OpChain {
public:
- OpChain(GrOp::Owner, GrProcessorSet::Analysis, GrAppliedClip*, const DstProxyView*);
+ OpChain(GrOp::Owner, GrProcessorSet::Analysis, GrAppliedClip*, const GrDstProxyView*);
~OpChain() {
// The ops are stored in a GrMemoryPool and must be explicitly deleted via the pool.
SkASSERT(fList.empty());
@@ -162,7 +159,7 @@
GrOp* head() const { return fList.head(); }
GrAppliedClip* appliedClip() const { return fAppliedClip; }
- const DstProxyView& dstProxyView() const { return fDstProxyView; }
+ const GrDstProxyView& dstProxyView() const { return fDstProxyView; }
const SkRect& bounds() const { return fBounds; }
// Deletes all the ops in the chain.
@@ -176,7 +173,7 @@
// Attempts to add 'op' to this chain either by merging or adding to the tail. Returns
// 'op' to the caller upon failure, otherwise null. Fails when the op and chain aren't of
// the same op type, have different clips or dst proxies.
- GrOp::Owner appendOp(GrOp::Owner op, GrProcessorSet::Analysis, const DstProxyView*,
+ GrOp::Owner appendOp(GrOp::Owner op, GrProcessorSet::Analysis, const GrDstProxyView*,
const GrAppliedClip*, const GrCaps&, SkArenaAlloc* opsTaskArena,
GrAuditTrail*);
@@ -210,14 +207,14 @@
void validate() const;
- bool tryConcat(List*, GrProcessorSet::Analysis, const DstProxyView&, const GrAppliedClip*,
+ bool tryConcat(List*, GrProcessorSet::Analysis, const GrDstProxyView&, const GrAppliedClip*,
const SkRect& bounds, const GrCaps&, SkArenaAlloc* opsTaskArena,
GrAuditTrail*);
static List DoConcat(List, List, const GrCaps&, SkArenaAlloc* opsTaskArena, GrAuditTrail*);
List fList;
GrProcessorSet::Analysis fProcessorAnalysis;
- DstProxyView fDstProxyView;
+ GrDstProxyView fDstProxyView;
GrAppliedClip* fAppliedClip;
SkRect fBounds;
};
@@ -229,7 +226,7 @@
void gatherProxyIntervals(GrResourceAllocator*) const override;
void recordOp(GrOp::Owner, GrProcessorSet::Analysis, GrAppliedClip*,
- const DstProxyView*, const GrCaps&);
+ const GrDstProxyView*, const GrCaps&);
void forwardCombine(const GrCaps&);
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index f5415c2c..3f9a4f5 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -68,7 +68,7 @@
struct InitArgs {
InputFlags fInputFlags = InputFlags::kNone;
const GrCaps* fCaps = nullptr;
- GrXferProcessor::DstProxyView fDstProxyView;
+ GrDstProxyView fDstProxyView;
GrSwizzle fWriteSwizzle;
};
diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index c5c25d8..48a756d 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -1899,7 +1899,7 @@
// Must be called before setDstProxyView so that it sees the final bounds of the op.
op->setClippedBounds(bounds);
- GrXferProcessor::DstProxyView dstProxyView;
+ GrDstProxyView dstProxyView;
if (analysis.requiresDstTexture()) {
if (!this->setupDstProxyView(*op, &dstProxyView)) {
return;
@@ -1937,8 +1937,7 @@
#endif
}
-bool GrSurfaceDrawContext::setupDstProxyView(const GrOp& op,
- GrXferProcessor::DstProxyView* dstProxyView) {
+bool GrSurfaceDrawContext::setupDstProxyView(const GrOp& op, GrDstProxyView* dstProxyView) {
// If we are wrapping a vulkan secondary command buffer, we can't make a dst copy because we
// don't actually have a VkImage to make a copy of. Additionally we don't have the power to
// start and stop the render pass in order to make the copy.
diff --git a/src/gpu/GrSurfaceDrawContext.h b/src/gpu/GrSurfaceDrawContext.h
index 9733225..ff88c4d 100644
--- a/src/gpu/GrSurfaceDrawContext.h
+++ b/src/gpu/GrSurfaceDrawContext.h
@@ -711,8 +711,7 @@
// value is false then a texture copy could not be made.
//
// The op should have already had setClippedBounds called on it.
- bool SK_WARN_UNUSED_RESULT setupDstProxyView(const GrOp& op,
- GrXferProcessor::DstProxyView* result);
+ bool SK_WARN_UNUSED_RESULT setupDstProxyView(const GrOp& op, GrDstProxyView* result);
SkGlyphRunListPainter* glyphPainter() { return &fGlyphPainter; }
diff --git a/src/gpu/GrSurfaceFillContext.cpp b/src/gpu/GrSurfaceFillContext.cpp
index 0cf7b32..e6fcc3f 100644
--- a/src/gpu/GrSurfaceFillContext.cpp
+++ b/src/gpu/GrSurfaceFillContext.cpp
@@ -303,7 +303,7 @@
op->setClippedBounds(op->bounds());
SkDEBUGCODE(op->fAddDrawOpCalled = true;)
- GrXferProcessor::DstProxyView dstProxyView;
+ GrDstProxyView dstProxyView;
this->getOpsTask()->addDrawOp(fContext->priv().drawingManager(),
std::move(owner),
op->usesMSAA(),
diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/GrXferProcessor.h
index 3991cb2..272d450 100644
--- a/src/gpu/GrXferProcessor.h
+++ b/src/gpu/GrXferProcessor.h
@@ -41,6 +41,58 @@
GR_MAKE_BITFIELD_CLASS_OPS(GrXferBarrierFlags)
/**
+ * GrDstProxyView holds a texture containing the destination pixel values, and an integer-coordinate
+ * offset from device-space to the space of the texture. When framebuffer fetch is not available, a
+ * GrDstProxyView may be used to support blending in the fragment shader/xfer processor.
+ */
+class GrDstProxyView {
+public:
+ GrDstProxyView() { fOffset.set(0, 0); }
+
+ GrDstProxyView(const GrDstProxyView& other) {
+ *this = other;
+ }
+
+ GrDstProxyView& operator=(const GrDstProxyView& other) {
+ fProxyView = other.fProxyView;
+ fOffset = other.fOffset;
+ fDstSampleType = other.fDstSampleType;
+ return *this;
+ }
+
+ bool operator==(const GrDstProxyView& that) const {
+ return fProxyView == that.fProxyView &&
+ fOffset == that.fOffset &&
+ fDstSampleType == that.fDstSampleType;
+ }
+ bool operator!=(const GrDstProxyView& that) const { return !(*this == that); }
+
+ const SkIPoint& offset() const { return fOffset; }
+
+ void setOffset(const SkIPoint& offset) { fOffset = offset; }
+ void setOffset(int ox, int oy) { fOffset.set(ox, oy); }
+
+ GrSurfaceProxy* proxy() const { return fProxyView.proxy(); }
+ const GrSurfaceProxyView& proxyView() const { return fProxyView; }
+
+ void setProxyView(GrSurfaceProxyView view) {
+ fProxyView = std::move(view);
+ if (!fProxyView.proxy()) {
+ fOffset = {0, 0};
+ }
+ }
+
+ GrDstSampleType dstSampleType() const { return fDstSampleType; }
+
+ void setDstSampleType(GrDstSampleType dstSampleType) { fDstSampleType = dstSampleType; }
+
+private:
+ GrSurfaceProxyView fProxyView;
+ SkIPoint fOffset;
+ GrDstSampleType fDstSampleType = GrDstSampleType::kNone;
+};
+
+/**
* GrXferProcessor is responsible for implementing the xfer mode that blends the src color and dst
* color, and for applying any coverage. It does this by emitting fragment shader code and
* controlling the fixed-function blend state. When dual-source blending is available, it may also
@@ -59,58 +111,6 @@
class GrXferProcessor : public GrProcessor, public GrNonAtomicRef<GrXferProcessor> {
public:
/**
- * A texture that contains the dst pixel values and an integer coord offset from device space
- * to the space of the texture. Depending on GPU capabilities a DstTexture may be used by a
- * GrXferProcessor for blending in the fragment shader.
- */
- class DstProxyView {
- public:
- DstProxyView() { fOffset.set(0, 0); }
-
- DstProxyView(const DstProxyView& other) {
- *this = other;
- }
-
- DstProxyView& operator=(const DstProxyView& other) {
- fProxyView = other.fProxyView;
- fOffset = other.fOffset;
- fDstSampleType = other.fDstSampleType;
- return *this;
- }
-
- bool operator==(const DstProxyView& that) const {
- return fProxyView == that.fProxyView &&
- fOffset == that.fOffset &&
- fDstSampleType == that.fDstSampleType;
- }
- bool operator!=(const DstProxyView& that) const { return !(*this == that); }
-
- const SkIPoint& offset() const { return fOffset; }
-
- void setOffset(const SkIPoint& offset) { fOffset = offset; }
- void setOffset(int ox, int oy) { fOffset.set(ox, oy); }
-
- GrSurfaceProxy* proxy() const { return fProxyView.proxy(); }
- const GrSurfaceProxyView& proxyView() const { return fProxyView; }
-
- void setProxyView(GrSurfaceProxyView view) {
- fProxyView = std::move(view);
- if (!fProxyView.proxy()) {
- fOffset = {0, 0};
- }
- }
-
- GrDstSampleType dstSampleType() const { return fDstSampleType; }
-
- void setDstSampleType(GrDstSampleType dstSampleType) { fDstSampleType = dstSampleType; }
-
- private:
- GrSurfaceProxyView fProxyView;
- SkIPoint fOffset;
- GrDstSampleType fDstSampleType = GrDstSampleType::kNone;
- };
-
- /**
* Sets a unique key on the GrProcessorKeyBuilder calls onGetGLSLProcessorKey(...) to get the
* specific subclass's key.
*/
@@ -246,8 +246,6 @@
#endif
class GrXPFactory {
public:
- typedef GrXferProcessor::DstProxyView DstProxyView;
-
enum class AnalysisProperties : unsigned {
kNone = 0x0,
/**
diff --git a/src/gpu/mock/GrMockOpTarget.h b/src/gpu/mock/GrMockOpTarget.h
index 983b29d..b5a18e3 100644
--- a/src/gpu/mock/GrMockOpTarget.h
+++ b/src/gpu/mock/GrMockOpTarget.h
@@ -37,7 +37,7 @@
SkArenaAlloc* allocator() override { return &fAllocator; }
void putBackVertices(int vertices, size_t vertexStride) override { /* no-op */ }
GrAppliedClip detachAppliedClip() override { return GrAppliedClip::Disabled(); }
- const GrXferProcessor::DstProxyView& dstProxyView() const override { return fDstProxyView; }
+ const GrDstProxyView& dstProxyView() const override { return fDstProxyView; }
GrXferBarrierFlags renderPassBarriers() const override { return GrXferBarrierFlags::kNone; }
GrLoadOp colorLoadOp() const override { return GrLoadOp::kLoad; }
@@ -119,7 +119,7 @@
char fStaticIndirectData[sizeof(GrDrawIndexedIndirectCommand) * 32];
sk_sp<GrGpuBuffer> fStaticIndirectBuffer;
SkSTArenaAllocWithReset<1024 * 1024> fAllocator;
- GrXferProcessor::DstProxyView fDstProxyView;
+ GrDstProxyView fDstProxyView;
};
#endif
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 62781fd..75dd799 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -756,7 +756,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkMatrix invert;
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index bdb733e..34e290f 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -907,14 +907,14 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
void onPrePrepareDraws(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
@@ -1108,7 +1108,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
// Setup the viewmatrix and localmatrix for the GrGeometryProcessor.
@@ -1150,7 +1150,7 @@
void AAHairlineOp::onPrePrepareDraws(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index ac30716..d42c970 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -203,7 +203,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp = create_lines_only_gp(arena,
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 2d18965..6c41299 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -172,7 +172,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
// We cannot surface the GrAtlasTextOp's programInfo at record time. As currently
@@ -183,7 +183,7 @@
void onPrePrepareDraws(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
// TODO [PI]: implement
diff --git a/src/gpu/ops/GrClearOp.h b/src/gpu/ops/GrClearOp.h
index 4f3a13e..cf4281d 100644
--- a/src/gpu/ops/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
@@ -51,8 +51,8 @@
CombineResult onCombineIfPossible(GrOp* t, SkArenaAlloc*, const GrCaps& caps) override;
void onPrePrepare(GrRecordingContext*, const GrSurfaceProxyView& writeView, GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
- GrXferBarrierFlags renderPassXferBarriers, GrLoadOp colorLoadOp) override {}
+ const GrDstProxyView&, GrXferBarrierFlags renderPassXferBarriers,
+ GrLoadOp colorLoadOp) override {}
void onPrepare(GrOpFlushState*) override {}
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index 140ead2..d80bf99 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -317,7 +317,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 9d19886..088d345 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -434,7 +434,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp;
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 7d6405b..f537749 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -55,7 +55,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
@@ -202,7 +202,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
// Setup geometry processor
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index a5a6439..514d2e9 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -235,7 +235,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
@@ -395,7 +395,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
GrGeometryProcessor* gp = this->makeGP(arena);
diff --git a/src/gpu/ops/GrDrawableOp.h b/src/gpu/ops/GrDrawableOp.h
index 31d8a2b..d02b6c4 100644
--- a/src/gpu/ops/GrDrawableOp.h
+++ b/src/gpu/ops/GrDrawableOp.h
@@ -38,7 +38,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index b3f1080..054dbdf 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -106,7 +106,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) final;
@@ -683,7 +683,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
GrGeometryProcessor* gp = Processor::Make(arena, fHelper.aaType(), fProcessorFlags);
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index d24b360..50abd19 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -201,7 +201,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
const VertexSpec vertexSpec = this->vertexSpec();
@@ -219,7 +219,7 @@
void onPrePrepareDraws(GrRecordingContext* rContext,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 97e4fd4..2e21b98 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -198,7 +198,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 2db3088..0e2e923 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -31,7 +31,7 @@
void GrMeshDrawOp::onPrePrepareDraws(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index 1cc8752..cbb33a5 100644
--- a/src/gpu/ops/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
@@ -42,7 +42,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
this->onCreateProgramInfo(caps, arena, writeView, std::move(appliedClip), dstProxyView,
@@ -107,7 +107,7 @@
virtual void onPrePrepareDraws(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp);
@@ -119,14 +119,14 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) = 0;
void onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) final {
this->onPrePrepareDraws(context, writeView, clip, dstProxyView, renderPassXferBarriers,
@@ -229,7 +229,7 @@
virtual const GrAppliedClip* appliedClip() const = 0;
virtual GrAppliedClip detachAppliedClip() = 0;
- virtual const GrXferProcessor::DstProxyView& dstProxyView() const = 0;
+ virtual const GrDstProxyView& dstProxyView() const = 0;
virtual bool usesMSAASurface() const = 0;
virtual GrXferBarrierFlags renderPassBarriers() const = 0;
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index 34acb43..b4f548b 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -172,7 +172,7 @@
* ahead of time and when it has not been called).
*/
void prePrepare(GrRecordingContext* context, const GrSurfaceProxyView& dstView,
- GrAppliedClip* clip, const GrXferProcessor::DstProxyView& dstProxyView,
+ GrAppliedClip* clip, const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers, GrLoadOp colorLoadOp) {
TRACE_EVENT0("skia.gpu", name());
this->onPrePrepare(context, dstView, clip, dstProxyView, renderPassXferBarriers,
@@ -311,7 +311,7 @@
virtual void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) = 0;
virtual void onPrepare(GrOpFlushState*) = 0;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index 0d0b3e8..bc6b603 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -1275,7 +1275,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkMatrix localMatrix;
@@ -1637,7 +1637,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkMatrix localMatrix;
@@ -1970,7 +1970,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkMatrix localMatrix;
@@ -2246,7 +2246,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp = DIEllipseGeometryProcessor::Make(arena, fWideColor, fUseScale,
@@ -2644,7 +2644,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
// Invert the view matrix as a local matrix (if any other processors require coords).
@@ -2967,7 +2967,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkMatrix localMatrix;
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index 9ec8ce9..210b02e 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -87,7 +87,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp = make_gp(arena, fViewMatrix, fWideColor);
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index 125816c..36c001b 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -529,7 +529,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp = GrRRectShadowGeoProc::Make(arena, fFalloffView);
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index 743b435..5c29d4f 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -111,7 +111,7 @@
SkArenaAlloc* arena,
GrSwizzle writeViewSwizzle,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrProcessorSet&& processorSet,
GrPipeline::InputFlags pipelineFlags) {
GrPipeline::InitArgs pipelineArgs;
@@ -154,7 +154,7 @@
SkArenaAlloc* arena,
GrSwizzle writeViewSwizzle,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView) {
+ const GrDstProxyView& dstProxyView) {
return GrSimpleMeshDrawOpHelper::CreatePipeline(caps,
arena,
writeViewSwizzle,
@@ -169,7 +169,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrGeometryProcessor* geometryProcessor,
GrProcessorSet&& processorSet,
GrPrimitiveType primitiveType,
@@ -213,7 +213,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrGeometryProcessor* gp,
GrPrimitiveType primType,
GrXferBarrierFlags renderPassXferBarriers,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index 0c39a5f..77e5f64 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -115,7 +115,7 @@
SkArenaAlloc*,
GrSwizzle writeViewSwizzle,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrProcessorSet&&,
GrPipeline::InputFlags pipelineFlags);
static const GrPipeline* CreatePipeline(
@@ -129,7 +129,7 @@
SkArenaAlloc*,
GrSwizzle writeViewSwizzle,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&);
+ const GrDstProxyView&);
static GrProgramInfo* CreateProgramInfo(SkArenaAlloc*,
const GrPipeline*,
@@ -148,7 +148,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrGeometryProcessor*,
GrProcessorSet&&,
GrPrimitiveType,
@@ -163,7 +163,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrGeometryProcessor*,
GrPrimitiveType,
GrXferBarrierFlags renderPassXferBarriers,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
index 3c24b26..e25da42 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp
@@ -47,7 +47,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeViewSwizzle,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrGeometryProcessor* gp,
GrPrimitiveType primType,
GrXferBarrierFlags renderPassXferBarriers,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
index 787e414..460877f 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h
@@ -26,7 +26,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeViewSwizzle,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrGeometryProcessor*,
GrPrimitiveType,
GrXferBarrierFlags renderPassXferBarriers,
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 4935057..d80dedc 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -169,7 +169,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
// We cannot surface the SmallPathOp's programInfo at record time. As currently
@@ -180,7 +180,7 @@
void onPrePrepareDraws(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
// TODO [PI]: implement
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index 41a99d8..7db95ff 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -173,7 +173,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp;
@@ -441,7 +441,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
@@ -518,7 +518,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index ee268c3..afa0017 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -650,7 +650,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkASSERT(fDesc);
@@ -683,7 +683,7 @@
void onPrePrepareDraws(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index 77a5e9c..138e51b 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -441,7 +441,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
GrGeometryProcessor* gp;
@@ -494,7 +494,7 @@
void onPrePrepareDraws(GrRecordingContext* rContext,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
TRACE_EVENT0("skia.gpu", TRACE_FUNC);
diff --git a/src/gpu/tessellate/GrDrawAtlasPathOp.cpp b/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
index 5ecb058..d2cb90e 100644
--- a/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
+++ b/src/gpu/tessellate/GrDrawAtlasPathOp.cpp
@@ -144,7 +144,7 @@
void GrDrawAtlasPathOp::onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {}
diff --git a/src/gpu/tessellate/GrDrawAtlasPathOp.h b/src/gpu/tessellate/GrDrawAtlasPathOp.h
index ca2ad93..d41c4e4 100644
--- a/src/gpu/tessellate/GrDrawAtlasPathOp.h
+++ b/src/gpu/tessellate/GrDrawAtlasPathOp.h
@@ -44,7 +44,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
diff --git a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
index 76ff534..0b71527 100644
--- a/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
+++ b/src/gpu/tessellate/GrPathInnerTriangulateOp.cpp
@@ -310,7 +310,7 @@
void GrPathInnerTriangulateOp::onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
this->prePreparePrograms({context->priv().recordTimeAllocator(), writeView, &dstProxyView,
diff --git a/src/gpu/tessellate/GrPathInnerTriangulateOp.h b/src/gpu/tessellate/GrPathInnerTriangulateOp.h
index 4b1051c..200d818 100644
--- a/src/gpu/tessellate/GrPathInnerTriangulateOp.h
+++ b/src/gpu/tessellate/GrPathInnerTriangulateOp.h
@@ -52,8 +52,7 @@
void prePreparePrograms(const GrTessellationShader::ProgramArgs&, GrAppliedClip&&);
void onPrePrepare(GrRecordingContext*, const GrSurfaceProxyView&, GrAppliedClip*,
- const GrXferProcessor::DstProxyView&, GrXferBarrierFlags,
- GrLoadOp colorLoadOp) override;
+ const GrDstProxyView&, GrXferBarrierFlags, GrLoadOp colorLoadOp) override;
void onPrepare(GrOpFlushState*) override;
void onExecute(GrOpFlushState*, const SkRect& chainBounds) override;
diff --git a/src/gpu/tessellate/GrPathStencilFillOp.cpp b/src/gpu/tessellate/GrPathStencilFillOp.cpp
index a92e1db..3607c33 100644
--- a/src/gpu/tessellate/GrPathStencilFillOp.cpp
+++ b/src/gpu/tessellate/GrPathStencilFillOp.cpp
@@ -139,7 +139,7 @@
void GrPathStencilFillOp::onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView& writeView, GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
this->prePreparePrograms({context->priv().recordTimeAllocator(), writeView, &dstProxyView,
diff --git a/src/gpu/tessellate/GrPathStencilFillOp.h b/src/gpu/tessellate/GrPathStencilFillOp.h
index c41d1fe..358692b 100644
--- a/src/gpu/tessellate/GrPathStencilFillOp.h
+++ b/src/gpu/tessellate/GrPathStencilFillOp.h
@@ -44,8 +44,7 @@
void prePreparePrograms(const GrTessellationShader::ProgramArgs&, GrAppliedClip&& clip);
void onPrePrepare(GrRecordingContext*, const GrSurfaceProxyView&, GrAppliedClip*,
- const GrXferProcessor::DstProxyView&, GrXferBarrierFlags,
- GrLoadOp colorLoadOp) override;
+ const GrDstProxyView&, GrXferBarrierFlags, GrLoadOp colorLoadOp) override;
void onPrepare(GrOpFlushState*) override;
void onExecute(GrOpFlushState*, const SkRect& chainBounds) override;
diff --git a/src/gpu/tessellate/GrStrokeTessellateOp.cpp b/src/gpu/tessellate/GrStrokeTessellateOp.cpp
index 8df995f..bd4d8fd 100644
--- a/src/gpu/tessellate/GrStrokeTessellateOp.cpp
+++ b/src/gpu/tessellate/GrStrokeTessellateOp.cpp
@@ -215,7 +215,7 @@
void GrStrokeTessellateOp::onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView& writeView, GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers, GrLoadOp
colorLoadOp) {
this->prePrepareTessellator({context->priv().recordTimeAllocator(), writeView, &dstProxyView,
diff --git a/src/gpu/tessellate/GrStrokeTessellateOp.h b/src/gpu/tessellate/GrStrokeTessellateOp.h
index daf9d3d..e3890cb 100644
--- a/src/gpu/tessellate/GrStrokeTessellateOp.h
+++ b/src/gpu/tessellate/GrStrokeTessellateOp.h
@@ -58,8 +58,7 @@
void prePrepareTessellator(GrTessellationShader::ProgramArgs&&, GrAppliedClip&&);
void onPrePrepare(GrRecordingContext*, const GrSurfaceProxyView&, GrAppliedClip*,
- const GrXferProcessor::DstProxyView&, GrXferBarrierFlags,
- GrLoadOp colorLoadOp) override;
+ const GrDstProxyView&, GrXferBarrierFlags, GrLoadOp colorLoadOp) override;
void onPrepare(GrOpFlushState*) override;
diff --git a/src/gpu/tessellate/shaders/GrTessellationShader.h b/src/gpu/tessellate/shaders/GrTessellationShader.h
index 89929f2..2092d27 100644
--- a/src/gpu/tessellate/shaders/GrTessellationShader.h
+++ b/src/gpu/tessellate/shaders/GrTessellationShader.h
@@ -51,7 +51,7 @@
struct ProgramArgs {
SkArenaAlloc* fArena;
const GrSurfaceProxyView& fWriteView;
- const GrXferProcessor::DstProxyView* fDstProxyView;
+ const GrDstProxyView* fDstProxyView;
GrXferBarrierFlags fXferBarrierFlags;
GrLoadOp fColorLoadOp;
const GrCaps* fCaps;
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index e5fab3c..5351030 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -227,7 +227,7 @@
surfaceView,
false /*usesMSAASurface*/,
nullptr,
- GrXferProcessor::DstProxyView(),
+ GrDstProxyView(),
GrXferBarrierFlags::kNone,
GrLoadOp::kLoad);
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 40a9ccd..27d95fd 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -424,7 +424,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
void onPrepare(GrOpFlushState* state) override {
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index e778a62..3d2e606 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -145,7 +145,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
void onPrepare(GrOpFlushState*) override {}
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index 51b5342..ab458d6 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -1080,7 +1080,7 @@
ERRORF(reporter, "Could not make texture.");
return;
}
- GrXferProcessor::DstProxyView fakeDstProxyView;
+ GrDstProxyView fakeDstProxyView;
{
sk_sp<GrTextureProxy> proxy = proxyProvider->wrapBackendTexture(
mbet->texture(), kBorrow_GrWrapOwnership, GrWrapCacheable::kNo, kRead_GrIOType,
diff --git a/tests/GrThreadSafeCacheTest.cpp b/tests/GrThreadSafeCacheTest.cpp
index 82eb142..0c36732 100644
--- a/tests/GrThreadSafeCacheTest.cpp
+++ b/tests/GrThreadSafeCacheTest.cpp
@@ -455,7 +455,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) const {
using namespace GrDefaultGeoProcFactory;
@@ -547,7 +547,7 @@
void onPrePrepare(GrRecordingContext* rContext,
const GrSurfaceProxyView& writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
SkArenaAlloc* arena = rContext->priv().recordTimeAllocator();
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index ceb26cd..9a12208 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -111,7 +111,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
@@ -360,7 +360,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
void onPrepare(GrOpFlushState*) override {}
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index 7c4aba5..07dabee 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -102,7 +102,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
using namespace GrDefaultGeoProcFactory;
diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp
index 2761f21..c09668f 100644
--- a/tests/OpChainTest.cpp
+++ b/tests/OpChainTest.cpp
@@ -127,7 +127,7 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 27ef7fc..1d75431 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -60,7 +60,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {
class GP : public GrGeometryProcessor {
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 746c589..754293c 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -65,13 +65,13 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
void onPrePrepareDraws(GrRecordingContext*,
const GrSurfaceProxyView& writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override {}
void onPrepareDraws(Target* target) override { return; }
diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp
index 756eaa1..f2fe4e9 100644
--- a/tools/gpu/ProxyUtils.cpp
+++ b/tools/gpu/ProxyUtils.cpp
@@ -92,7 +92,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrGeometryProcessor* geomProc,
SkBlendMode blendMode,
GrPrimitiveType primitiveType,
diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index c4db536..bc2dafe 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -32,7 +32,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrGeometryProcessor*,
SkBlendMode,
GrPrimitiveType,
diff --git a/tools/gpu/TestOps.cpp b/tools/gpu/TestOps.cpp
index 9e74d0d..98b5930 100644
--- a/tools/gpu/TestOps.cpp
+++ b/tools/gpu/TestOps.cpp
@@ -125,7 +125,7 @@
SkArenaAlloc*,
const GrSurfaceProxyView& writeView,
GrAppliedClip&&,
- const GrXferProcessor::DstProxyView&,
+ const GrDstProxyView&,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) override;
@@ -184,7 +184,7 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView& writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView,
+ const GrDstProxyView& dstProxyView,
GrXferBarrierFlags renderPassXferBarriers,
GrLoadOp colorLoadOp) {
fProgramInfo = GrSimpleMeshDrawOpHelper::CreateProgramInfo(caps,
