Fuse GrPrimitiveProcessor & GrGeometryProcessor into a new GrGeometryProcessor
With the removal of NVPR we no longer need this distinction.
Bug: skia:11760
Change-Id: I225a4feb764395fb72aca3ffc8b6d05396bf0b1e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386890
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 3671b3e..9b02412 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -566,7 +566,7 @@
GLSLProcessor() {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
- const QuadEdgeEffect& qe = args.fGP.cast<QuadEdgeEffect>();
+ const QuadEdgeEffect& qe = args.fGeomProc.cast<QuadEdgeEffect>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
@@ -623,8 +623,8 @@
}
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& gp) override {
- const QuadEdgeEffect& qe = gp.cast<QuadEdgeEffect>();
+ const GrGeometryProcessor& geomProc) override {
+ const QuadEdgeEffect& qe = geomProc.cast<QuadEdgeEffect>();
this->setTransform(pdman, fLocalMatrixUniform, qe.fLocalMatrix, &fLocalMatrix);
}
@@ -777,7 +777,7 @@
}
}
- const size_t kVertexStride = fProgramInfo->primProc().vertexStride();
+ const size_t kVertexStride = fProgramInfo->geomProc().vertexStride();
fDraws.reserve(instanceCount);
@@ -859,7 +859,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
for (int i = 0; i < fDraws.count(); ++i) {
for (int j = 0; j < fDraws[i].fMeshCount; ++j) {
flushState->drawMesh(fDraws[i].fMeshes[j]);
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 631f20c..912a6b2 100644
--- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -1302,7 +1302,7 @@
for (int i = 0; i < 3; ++i) {
if (fProgramInfos[i] && fMeshes[i]) {
flushState->bindPipelineAndScissorClip(*fProgramInfos[i], chainBounds);
- flushState->bindTextures(fProgramInfos[i]->primProc(), nullptr,
+ flushState->bindTextures(fProgramInfos[i]->geomProc(), nullptr,
fProgramInfos[i]->pipeline());
flushState->drawMesh(*fMeshes[i]);
}
diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index adef79e..0cee751 100644
--- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -260,7 +260,7 @@
}
}
- size_t vertexStride = fProgramInfo->primProc().vertexStride();
+ size_t vertexStride = fProgramInfo->geomProc().vertexStride();
int instanceCount = fPaths.count();
int64_t vertexCount = 0;
@@ -334,7 +334,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
for (int i = 0; i < fMeshes.count(); ++i) {
flushState->drawMesh(*fMeshes[i]);
}
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index d67e1a3..fd0caa3 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -601,7 +601,7 @@
return;
}
- QuadHelper helper(target, fProgramInfo->primProc().vertexStride(), totalRectCount);
+ QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), totalRectCount);
GrVertexWriter vertices{ helper.vertices() };
if (!vertices.fPtr) {
return;
@@ -661,7 +661,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -867,7 +867,7 @@
const GrShaderCaps&,
GrProcessorKeyBuilder*);
- void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) override;
+ void setData(const GrGLSLProgramDataManager&, const GrGeometryProcessor&) override;
private:
UniformHandle fParamUniform;
@@ -892,7 +892,7 @@
}
void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
- const DashingCircleEffect& dce = args.fGP.cast<DashingCircleEffect>();
+ const DashingCircleEffect& dce = args.fGeomProc.cast<DashingCircleEffect>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -942,8 +942,8 @@
}
void GLDashingCircleEffect::setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& processor) {
- const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
+ const GrGeometryProcessor& geomProc) {
+ const DashingCircleEffect& dce = geomProc.cast<DashingCircleEffect>();
if (dce.color() != fColor) {
pdman.set4fv(fColorUniform, 1, dce.color().vec());
fColor = dce.color();
@@ -1079,7 +1079,7 @@
const GrShaderCaps&,
GrProcessorKeyBuilder*);
- void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) override;
+ void setData(const GrGLSLProgramDataManager&, const GrGeometryProcessor&) override;
private:
SkPMColor4f fColor;
@@ -1094,7 +1094,7 @@
GLDashingLineEffect::GLDashingLineEffect() : fColor(SK_PMColor4fILLEGAL) {}
void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
- const DashingLineEffect& de = args.fGP.cast<DashingLineEffect>();
+ const DashingLineEffect& de = args.fGeomProc.cast<DashingLineEffect>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
@@ -1170,8 +1170,8 @@
}
void GLDashingLineEffect::setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& processor) {
- const DashingLineEffect& de = processor.cast<DashingLineEffect>();
+ const GrGeometryProcessor& geomProc) {
+ const DashingLineEffect& de = geomProc.cast<DashingLineEffect>();
if (de.color() != fColor) {
pdman.set4fv(fColorUniform, 1, de.color().vec());
fColor = de.color();
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 6f4be70..e40ccc0 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -482,7 +482,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
for (int i = 0; i < fMeshes.count(); ++i) {
flushState->drawMesh(*fMeshes[i]);
}
diff --git a/src/gpu/ops/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 5f59bd1..1138ca8 100644
--- a/src/gpu/ops/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
@@ -223,7 +223,7 @@
}
int instanceCount = fGeoData.count();
- size_t vertexStride = fProgramInfo->primProc().vertexStride();
+ size_t vertexStride = fProgramInfo->geomProc().vertexStride();
int numQuads = this->quadCount();
QuadHelper helper(target, vertexStride, numQuads);
@@ -251,7 +251,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 2b42d08..3cc6514 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -141,7 +141,7 @@
, fColor(SK_PMColor4fILLEGAL) {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
- const VerticesGP& gp = args.fGP.cast<VerticesGP>();
+ const VerticesGP& gp = args.fGeomProc.cast<VerticesGP>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
@@ -318,8 +318,8 @@
}
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& gp) override {
- const VerticesGP& vgp = gp.cast<VerticesGP>();
+ const GrGeometryProcessor& geomProc) override {
+ const VerticesGP& vgp = geomProc.cast<VerticesGP>();
this->setTransform(pdman, fViewMatrixUniform, vgp.viewMatrix(), &fViewMatrix);
@@ -741,7 +741,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrFillRRectOp.cpp b/src/gpu/ops/GrFillRRectOp.cpp
index d6a8cd8..4ad9752 100644
--- a/src/gpu/ops/GrFillRRectOp.cpp
+++ b/src/gpu/ops/GrFillRRectOp.cpp
@@ -329,7 +329,7 @@
using INHERITED = GrGeometryProcessor;
};
-constexpr GrPrimitiveProcessor::Attribute FillRRectOp::Processor::kVertexAttribs[];
+constexpr GrGeometryProcessor::Attribute FillRRectOp::Processor::kVertexAttribs[];
// Our coverage geometry consists of an inset octagon with solid coverage, surrounded by linear
// coverage ramps on the horizontal and vertical edges, and "arc coverage" pieces on the diagonal
@@ -490,7 +490,7 @@
GrGLSLVertexBuilder* v = args.fVertBuilder;
GrGLSLFPFragmentBuilder* f = args.fFragBuilder;
- const auto& proc = args.fGP.cast<Processor>();
+ const auto& proc = args.fGeomProc.cast<Processor>();
bool useHWDerivatives = (proc.fFlags & ProcessorFlags::kUseHWDerivatives);
SkASSERT(proc.vertexStride() == sizeof(CoverageVertex));
@@ -671,7 +671,7 @@
f->codeAppendf("half4 %s = half4(coverage);", args.fOutputCoverage);
}
- void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor&) override {}
+ void setData(const GrGLSLProgramDataManager&, const GrGeometryProcessor&) override {}
};
@@ -705,7 +705,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, this->bounds());
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->bindBuffers(std::move(fIndexBuffer), std::move(fInstanceBuffer),
std::move(fVertexBuffer));
flushState->drawIndexedInstanced(SK_ARRAY_COUNT(kIndexData), 0, fInstanceCount, fBaseInstance,
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index cee66c8..57ea5ba 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -315,7 +315,7 @@
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
flushState->bindBuffers(std::move(fIndexBuffer), nullptr, std::move(fVertexBuffer));
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
GrQuadPerEdgeAA::IssueDraw(flushState->caps(), flushState->opsRenderPass(), vertexSpec, 0,
fQuads.count(), totalNumVertices, fBaseVertex);
}
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 60f58a7..ab6fbb7 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -49,15 +49,15 @@
class GLSLProcessor : public GrGLSLGeometryProcessor {
public:
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& proc) override {
- const auto& latticeGP = proc.cast<LatticeGP>();
+ const GrGeometryProcessor& geomProc) override {
+ const auto& latticeGP = geomProc.cast<LatticeGP>();
fColorSpaceXformHelper.setData(pdman, latticeGP.fColorSpaceXform.get());
}
private:
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
using Interpolation = GrGLSLVaryingHandler::Interpolation;
- const auto& latticeGP = args.fGP.cast<LatticeGP>();
+ const auto& latticeGP = args.fGeomProc.cast<LatticeGP>();
fColorSpaceXformHelper.emitCode(args.fUniformHandler,
latticeGP.fColorSpaceXform.get());
@@ -236,7 +236,7 @@
return;
}
- const size_t kVertexStride = fProgramInfo->primProc().vertexStride();
+ const size_t kVertexStride = fProgramInfo->geomProc().vertexStride();
QuadHelper helper(target, kVertexStride, numRects);
@@ -322,7 +322,8 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), *fView.proxy(),
+ flushState->bindTextures(fProgramInfo->geomProc(),
+ *fView.proxy(),
fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index 4704b46..1cef7eb 100644
--- a/src/gpu/ops/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
@@ -143,7 +143,7 @@
virtual ~Target() {}
/** Adds a draw of a mesh. 'primProcProxies' must have
- * GrPrimitiveProcessor::numTextureSamplers() entries. Can be null if no samplers.
+ * GrGeometryProcessor::numTextureSamplers() entries. Can be null if no samplers.
*/
virtual void recordDraw(const GrGeometryProcessor*,
const GrSimpleMesh[],
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index ec856bf..2d20e8c 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -116,7 +116,7 @@
GLSLProcessor() {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
- const CircleGeometryProcessor& cgp = args.fGP.cast<CircleGeometryProcessor>();
+ const CircleGeometryProcessor& cgp = args.fGeomProc.cast<CircleGeometryProcessor>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -216,9 +216,9 @@
}
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& primProc) override {
+ const GrGeometryProcessor& geomProc) override {
this->setTransform(pdman, fLocalMatrixUniform,
- primProc.cast<CircleGeometryProcessor>().fLocalMatrix,
+ geomProc.cast<CircleGeometryProcessor>().fLocalMatrix,
&fLocalMatrix);
}
@@ -300,7 +300,7 @@
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
const ButtCapDashedCircleGeometryProcessor& bcscgp =
- args.fGP.cast<ButtCapDashedCircleGeometryProcessor>();
+ args.fGeomProc.cast<ButtCapDashedCircleGeometryProcessor>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -476,9 +476,9 @@
}
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& primProc) override {
+ const GrGeometryProcessor& geomProc) override {
this->setTransform(pdman, fLocalMatrixUniform,
- primProc.cast<ButtCapDashedCircleGeometryProcessor>().fLocalMatrix,
+ geomProc.cast<ButtCapDashedCircleGeometryProcessor>().fLocalMatrix,
&fLocalMatrix);
}
@@ -562,7 +562,7 @@
GLSLProcessor() {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
- const EllipseGeometryProcessor& egp = args.fGP.cast<EllipseGeometryProcessor>();
+ const EllipseGeometryProcessor& egp = args.fGeomProc.cast<EllipseGeometryProcessor>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -666,8 +666,8 @@
}
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& primProc) override {
- const EllipseGeometryProcessor& egp = primProc.cast<EllipseGeometryProcessor>();
+ const GrGeometryProcessor& geomProc) override {
+ const EllipseGeometryProcessor& egp = geomProc.cast<EllipseGeometryProcessor>();
this->setTransform(pdman, fLocalMatrixUniform, egp.fLocalMatrix, &fLocalMatrix);
}
@@ -761,7 +761,7 @@
GLSLProcessor() : fViewMatrix(SkMatrix::InvalidMatrix()) {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
- const DIEllipseGeometryProcessor& diegp = args.fGP.cast<DIEllipseGeometryProcessor>();
+ const auto& diegp = args.fGeomProc.cast<DIEllipseGeometryProcessor>();
GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
@@ -859,8 +859,8 @@
}
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& gp) override {
- const DIEllipseGeometryProcessor& diegp = gp.cast<DIEllipseGeometryProcessor>();
+ const GrGeometryProcessor& geomProc) override {
+ const auto& diegp = geomProc.cast<DIEllipseGeometryProcessor>();
this->setTransform(pdman, fViewMatrixUniform, diegp.fViewMatrix, &fViewMatrix);
}
@@ -1271,7 +1271,7 @@
sk_sp<const GrBuffer> vertexBuffer;
int firstVertex;
- GrVertexWriter vertices{target->makeVertexSpace(fProgramInfo->primProc().vertexStride(),
+ GrVertexWriter vertices{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
fVertCount, &vertexBuffer, &firstVertex)};
if (!vertices.fPtr) {
SkDebugf("Could not allocate vertices\n");
@@ -1396,7 +1396,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -1634,7 +1634,7 @@
sk_sp<const GrBuffer> vertexBuffer;
int firstVertex;
- GrVertexWriter vertices{target->makeVertexSpace(fProgramInfo->primProc().vertexStride(),
+ GrVertexWriter vertices{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
fVertCount, &vertexBuffer, &firstVertex)};
if (!vertices.fPtr) {
SkDebugf("Could not allocate vertices\n");
@@ -1718,7 +1718,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -1964,7 +1964,7 @@
}
}
- QuadHelper helper(target, fProgramInfo->primProc().vertexStride(), fEllipses.count());
+ QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), fEllipses.count());
GrVertexWriter verts{helper.vertices()};
if (!verts.fPtr) {
SkDebugf("Could not allocate vertices\n");
@@ -2009,7 +2009,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -2234,7 +2234,7 @@
this->createProgramInfo(target);
}
- QuadHelper helper(target, fProgramInfo->primProc().vertexStride(), fEllipses.count());
+ QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), fEllipses.count());
GrVertexWriter verts{helper.vertices()};
if (!verts.fPtr) {
return;
@@ -2275,7 +2275,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -2645,7 +2645,7 @@
sk_sp<const GrBuffer> vertexBuffer;
int firstVertex;
- GrVertexWriter verts{target->makeVertexSpace(fProgramInfo->primProc().vertexStride(),
+ GrVertexWriter verts{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
fVertCount, &vertexBuffer, &firstVertex)};
if (!verts.fPtr) {
SkDebugf("Could not allocate vertices\n");
@@ -2736,7 +2736,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -2974,7 +2974,7 @@
return;
}
PatternHelper helper(target, GrPrimitiveType::kTriangles,
- fProgramInfo->primProc().vertexStride(),
+ fProgramInfo->geomProc().vertexStride(),
std::move(indexBuffer), kVertsPerStandardRRect, indicesPerInstance,
fRRects.count(), kNumRRectsInIndexBuffer);
GrVertexWriter verts{helper.vertices()};
@@ -3056,7 +3056,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrQuadPerEdgeAA.cpp b/src/gpu/ops/GrQuadPerEdgeAA.cpp
index 5d8433a..9ad2d57 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.cpp
+++ b/src/gpu/ops/GrQuadPerEdgeAA.cpp
@@ -600,8 +600,8 @@
class GLSLProcessor : public GrGLSLGeometryProcessor {
public:
void setData(const GrGLSLProgramDataManager& pdman,
- const GrPrimitiveProcessor& proc) override {
- const auto& gp = proc.cast<QuadPerEdgeAAGeometryProcessor>();
+ const GrGeometryProcessor& geomProc) override {
+ const auto& gp = geomProc.cast<QuadPerEdgeAAGeometryProcessor>();
fTextureColorSpaceXformHelper.setData(pdman, gp.fTextureColorSpaceXform.get());
}
@@ -609,7 +609,7 @@
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
using Interpolation = GrGLSLVaryingHandler::Interpolation;
- const auto& gp = args.fGP.cast<QuadPerEdgeAAGeometryProcessor>();
+ const auto& gp = args.fGeomProc.cast<QuadPerEdgeAAGeometryProcessor>();
fTextureColorSpaceXformHelper.emitCode(args.fUniformHandler,
gp.fTextureColorSpaceXform.get());
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index d95979c..5401f47 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -122,7 +122,7 @@
return;
}
- QuadHelper helper(target, fProgramInfo->primProc().vertexStride(), numRects);
+ QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), numRects);
GrVertexWriter vertices{helper.vertices()};
if (!vertices.fPtr) {
@@ -149,7 +149,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index 7fa5bb1..e24beac 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -611,7 +611,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), *fFalloffView.proxy(),
+ flushState->bindTextures(fProgramInfo->geomProc(), *fFalloffView.proxy(),
fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index e8a358c..cfad2bd 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -201,7 +201,7 @@
this->createProgramInfo(target);
}
- size_t kVertexStride = fProgramInfo->primProc().vertexStride();
+ size_t kVertexStride = fProgramInfo->geomProc().vertexStride();
int vertexCount = kVertsPerHairlineRect;
if (fStrokeWidth > 0) {
vertexCount = kVertsPerStrokeRect;
@@ -241,7 +241,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
@@ -568,7 +568,7 @@
return;
}
PatternHelper helper(target, GrPrimitiveType::kTriangles,
- fProgramInfo->primProc().vertexStride(), std::move(indexBuffer),
+ fProgramInfo->geomProc().vertexStride(), std::move(indexBuffer),
verticesPerInstance, indicesPerInstance, instanceCount, maxQuads);
GrVertexWriter vertices{ helper.vertices() };
if (!vertices.fPtr) {
@@ -598,7 +598,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index c27a8b6..98ad665 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -928,7 +928,7 @@
for (unsigned p = 0; p < op.fMetadata.fProxyCount; ++p) {
const int quadCnt = op.fViewCountPairs[p].fQuadCnt;
SkASSERT(numDraws < fDesc->fNumProxies);
- flushState->bindTextures(fDesc->fProgramInfo->primProc(),
+ flushState->bindTextures(fDesc->fProgramInfo->geomProc(),
*op.fViewCountPairs[p].fProxy,
fDesc->fProgramInfo->pipeline());
GrQuadPerEdgeAA::IssueDraw(flushState->caps(), flushState->opsRenderPass(),
diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index f3b9ef5..54cc75b 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -594,7 +594,7 @@
}
flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
- flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+ flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
flushState->drawMesh(*fMesh);
}