Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit b43cfa4

Browse files
rphilliSkia Commit-Bot
rphilli
authored and
Skia Commit-Bot
committed
Revert "Add onPrePrepareDraws & createProgramInfo methods to GrDrawVerticesOp"
This reverts commit d360651. Reason for revert: DDL3 bots are red Original change's description: > Add onPrePrepareDraws & createProgramInfo methods to GrDrawVerticesOp > > This CL also incidentally adds: > > 1) a GrMeshDrawOp::Target 'outputView' virtual and switches GrOpFlushState over to overriding it. > > 2) a createProgramInfo helper to GrSimpleMeshDrawOpHelper > > Bug: skia:9455 > Change-Id: Iecd712d3ac76038651bd2e0512134e310930d527 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274551 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,robertphillips@google.com Change-Id: I6e44ba3bc47df27479af9344af946e27f0a2e937 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:9455 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274505 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
1 parent 8248ba6 commit b43cfa4

23 files changed

+103
-152
lines changed

‎gm/beziereffects.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class BezierTestOp : public GrMeshDrawOp {
106106
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) {
107107
return this->createProgramInfo(&flushState->caps(),
108108
flushState->allocator(),
109-
flushState->outputView(),
109+
flushState->view(),
110110
flushState->detachAppliedClip(),
111111
flushState->dstProxyView());
112112
}

‎gm/clockwise.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class ClockwiseTestOp : public GrDrawOp {
178178
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
179179
return this->createProgramInfo(&flushState->caps(),
180180
flushState->allocator(),
181-
flushState->outputView(),
181+
flushState->view(),
182182
flushState->detachAppliedClip(),
183183
flushState->dstProxyView());
184184
}

‎gm/fwidth_squircle.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class FwidthSquircleTestOp : public GrDrawOp {
186186
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
187187
return this->createProgramInfo(&flushState->caps(),
188188
flushState->allocator(),
189-
flushState->outputView(),
189+
flushState->view(),
190190
flushState->detachAppliedClip(),
191191
flushState->dstProxyView());
192192
}

‎gm/samplelocations.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class SampleLocationsTestOp : public GrDrawOp {
262262
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
263263
return this->createProgramInfo(&flushState->caps(),
264264
flushState->allocator(),
265-
flushState->outputView(),
265+
flushState->view(),
266266
flushState->detachAppliedClip(),
267267
flushState->dstProxyView());
268268
}

‎gm/tessellation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ class TessellationTestOp : public GrDrawOp {
333333
}
334334

335335
GrProgramInfo programInfo(state->proxy()->numSamples(), state->proxy()->numStencilSamples(),
336-
state->proxy()->backendFormat(), state->outputView()->origin(),
336+
state->proxy()->backendFormat(), state->view()->origin(),
337337
&pipeline, shader.get(), &fixedDynamicState, nullptr, 0,
338338
GrPrimitiveType::kPatches, tessellationPatchVertexCount);
339339

‎src/gpu/GrOpFlushState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void GrOpFlushState::executeDrawsAndUploadsForMeshDrawOp(
4646
GrProgramInfo programInfo(this->proxy()->numSamples(),
4747
this->proxy()->numStencilSamples(),
4848
this->proxy()->backendFormat(),
49-
this->outputView()->origin(),
49+
this->view()->origin(),
5050
pipeline,
5151
fCurrDraw->fGeometryProcessor,
5252
fCurrDraw->fFixedDynamicState,

‎src/gpu/GrOpFlushState.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class GrOpFlushState final : public GrDeferredUploadTarget, public GrMeshDrawOp:
7171
GrSwizzle outputSwizzle() const { return fSurfaceView->swizzle(); }
7272

7373
GrOp* op() { return fOp; }
74-
const GrSurfaceProxyView* outputView() const { return fSurfaceView; }
74+
const GrSurfaceProxyView* view() const { return fSurfaceView; }
7575
GrRenderTargetProxy* proxy() const { return fRenderTargetProxy; }
7676
GrAppliedClip* appliedClip() { return fAppliedClip; }
7777
const GrAppliedClip* appliedClip() const { return fAppliedClip; }
@@ -132,7 +132,7 @@ class GrOpFlushState final : public GrDeferredUploadTarget, public GrMeshDrawOp:
132132
int* actualIndexCount) final;
133133
void putBackIndices(int indexCount) final;
134134
void putBackVertices(int vertices, size_t vertexStride) final;
135-
const GrSurfaceProxyView* outputView() const final { return this->drawOpArgs().outputView(); }
135+
const GrSurfaceProxyView* view() const { return this->drawOpArgs().view(); }
136136
GrRenderTargetProxy* proxy() const final { return this->drawOpArgs().proxy(); }
137137
const GrAppliedClip* appliedClip() const final { return this->drawOpArgs().appliedClip(); }
138138
GrAppliedClip detachAppliedClip() final;

‎src/gpu/ccpr/GrCCCoverageProcessor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void GrCCCoverageProcessor::draw(
207207
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
208208
flushState->proxy()->numStencilSamples(),
209209
flushState->proxy()->backendFormat(),
210-
flushState->outputView()->origin(),
210+
flushState->view()->origin(),
211211
&pipeline,
212212
this,
213213
nullptr,

‎src/gpu/ccpr/GrCCPathProcessor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ void GrCCPathProcessor::drawPaths(GrOpFlushState* flushState, const GrPipeline&
144144
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
145145
flushState->proxy()->numStencilSamples(),
146146
flushState->proxy()->backendFormat(),
147-
flushState->outputView()->origin(),
147+
flushState->view()->origin(),
148148
&pipeline,
149149
this,
150150
fixedDynamicState,

‎src/gpu/ccpr/GrCCStroker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ void GrCCStroker::flushBufferedMeshesAsStrokes(const GrPrimitiveProcessor& proce
782782
GrProgramInfo programInfo(flushState->proxy()->numSamples(),
783783
flushState->proxy()->numStencilSamples(),
784784
flushState->proxy()->backendFormat(),
785-
flushState->outputView()->origin(),
785+
flushState->view()->origin(),
786786
&pipeline,
787787
&processor,
788788
nullptr,

0 commit comments

Comments
 (0)