Rename GrOptDrawState to GrPipeline and GrDrawState to GrPipelineBuilder
BUG=skia:
Review URL: https://codereview.chromium.org/858343002
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index b25ba7e..b96952a 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -150,7 +150,7 @@
context->getTestTarget(&tt);
SkASSERT(tt.target());
- GrDrawState ds;
+ GrPipelineBuilder pipelineBuilder;
GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
SkASSERT(gp->getVertexStride() == sizeof(Vertex));
@@ -165,10 +165,11 @@
verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);
}
- ds.setRenderTarget(rt);
+ pipelineBuilder.setRenderTarget(rt);
tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
- tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0,4,6);
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangleFan_GrPrimitiveType,
+ 0, 0,4,6);
}
++col;
if (numCols == col) {
@@ -306,7 +307,7 @@
context->getTestTarget(&tt);
SkASSERT(tt.target());
- GrDrawState ds;
+ GrPipelineBuilder pipelineBuilder;
GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
SkASSERT(gp->getVertexStride() == sizeof(Vertex));
@@ -321,10 +322,11 @@
verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);
}
- ds.setRenderTarget(rt);
+ pipelineBuilder.setRenderTarget(rt);
tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
- tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0,4,6);
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangleFan_GrPrimitiveType,
+ 0, 0,4,6);
}
++col;
if (numCols == col) {
@@ -493,7 +495,7 @@
context->getTestTarget(&tt);
SkASSERT(tt.target());
- GrDrawState ds;
+ GrPipelineBuilder pipelineBuilder;
GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
SkASSERT(gp->getVertexStride() == sizeof(Vertex));
@@ -506,10 +508,11 @@
GrPathUtils::QuadUVMatrix DevToUV(pts);
DevToUV.apply<4, sizeof(Vertex), sizeof(SkPoint)>(verts);
- ds.setRenderTarget(rt);
+ pipelineBuilder.setRenderTarget(rt);
tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
- tt.target()->drawIndexed(&ds, gp, kTriangles_GrPrimitiveType, 0, 0, 4, 6);
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangles_GrPrimitiveType,
+ 0, 0, 4, 6);
}
++col;
if (numCols == col) {
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 1ec7853..c92fd93 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -132,12 +132,12 @@
continue;
}
- GrDrawState ds;
+ GrPipelineBuilder pipelineBuilder;
SkAutoTUnref<const GrGeometryProcessor> gp(
GrDefaultGeoProcFactory::Create(GrDefaultGeoProcFactory::kPosition_GPType,
0xff000000));
- ds.addCoverageProcessor(fp);
- ds.setRenderTarget(rt);
+ pipelineBuilder.addCoverageProcessor(fp);
+ pipelineBuilder.setRenderTarget(rt);
GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
@@ -150,7 +150,8 @@
bounds.toQuad(verts);
tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
- tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangleFan_GrPrimitiveType,
+ 0, 0, 4, 6);
x += SkScalarCeilToScalar(path->getBounds().width() + 10.f);
}
@@ -189,12 +190,12 @@
continue;
}
- GrDrawState ds;
+ GrPipelineBuilder pipelineBuilder;
SkAutoTUnref<const GrGeometryProcessor> gp(
GrDefaultGeoProcFactory::Create(GrDefaultGeoProcFactory::kPosition_GPType,
0xff000000));
- ds.addCoverageProcessor(fp);
- ds.setRenderTarget(rt);
+ pipelineBuilder.addCoverageProcessor(fp);
+ pipelineBuilder.setRenderTarget(rt);
GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
@@ -205,7 +206,8 @@
bounds.toQuad(verts);
tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
- tt.target()->drawIndexed(&ds, gp, kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangleFan_GrPrimitiveType,
+ 0, 0, 4, 6);
x += SkScalarCeilToScalar(rect.width() + 10.f);
}
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 6016891..26d9194 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -112,7 +112,7 @@
SkDEBUGFAIL("Couldn't get Gr test target.");
return;
}
- GrDrawState drawState;
+ GrPipelineBuilder pipelineBuilder;
SkRRect rrect = fRRects[curRRect];
rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
@@ -120,13 +120,13 @@
SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType,
rrect));
if (fp) {
- drawState.addCoverageProcessor(fp);
- drawState.setRenderTarget(rt);
+ pipelineBuilder.addCoverageProcessor(fp);
+ pipelineBuilder.setRenderTarget(rt);
SkRect bounds = rrect.getBounds();
bounds.outset(2.f, 2.f);
- tt.target()->drawSimpleRect(&drawState, 0xff000000, SkMatrix::I(),
+ tt.target()->drawSimpleRect(&pipelineBuilder, 0xff000000, SkMatrix::I(),
bounds);
} else {
drew = false;
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 9ea45e1..7b74cec 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -130,11 +130,12 @@
}
SkMatrix viewMatrix;
viewMatrix.setTranslate(x, y);
- GrDrawState drawState;
- drawState.setRenderTarget(rt);
- drawState.addColorProcessor(fp);
+ GrPipelineBuilder pipelineBuilder;
+ pipelineBuilder.setRenderTarget(rt);
+ pipelineBuilder.addColorProcessor(fp);
- tt.target()->drawSimpleRect(&drawState, GrColor_WHITE, viewMatrix, renderRect);
+ tt.target()->drawSimpleRect(&pipelineBuilder, GrColor_WHITE, viewMatrix,
+ renderRect);
x += renderRect.width() + kTestPad;
}
y += renderRect.height() + kTestPad;
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index 3be01cc..21d42cb 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -115,10 +115,11 @@
if (fp) {
SkMatrix viewMatrix;
viewMatrix.setTranslate(x, y);
- GrDrawState drawState;
- drawState.setRenderTarget(rt);
- drawState.addColorProcessor(fp);
- tt.target()->drawSimpleRect(&drawState, GrColor_WHITE, viewMatrix, renderRect);
+ GrPipelineBuilder pipelineBuilder;
+ pipelineBuilder.setRenderTarget(rt);
+ pipelineBuilder.addColorProcessor(fp);
+ tt.target()->drawSimpleRect(&pipelineBuilder, GrColor_WHITE, viewMatrix,
+ renderRect);
}
x += renderRect.width() + kTestPad;
}