diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-09-23 09:50:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-23 09:50:21 -0700 |
| commit | b0a8a377f832c59cee939ad721e1f87d378b7142 (patch) | |
| tree | 7edeac33c817af28d73f3fbe1b31776ac34e8773 /src/gpu/GrAAHairLinePathRenderer.cpp | |
| parent | e51ac563de24ed4b25fde97c225580a30a55e9ca (diff) | |
Patch to create a distinct geometry processor. The vast majority of this patch
is just a rename. The meat is in GrGeometryProcessor, GrProcessor,
GrGL*Processor, GrProcessorStage, Gr*BackendProcessorFactory,
GrProcessUnitTestFactory, and the builders
BUG=skia:
R=bsalomon@google.com
Author: joshualitt@chromium.org
Review URL: https://codereview.chromium.org/582963002
Diffstat (limited to 'src/gpu/GrAAHairLinePathRenderer.cpp')
| -rw-r--r-- | src/gpu/GrAAHairLinePathRenderer.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index 2b4689e4d6..7347f9c25d 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -10,11 +10,11 @@ #include "GrContext.h" #include "GrDrawState.h" #include "GrDrawTargetCaps.h" -#include "GrEffect.h" +#include "GrProcessor.h" #include "GrGpu.h" #include "GrIndexBuffer.h" #include "GrPathUtils.h" -#include "GrTBackendEffectFactory.h" +#include "GrTBackendProcessorFactory.h" #include "SkGeometry.h" #include "SkStroke.h" #include "SkTemplates.h" @@ -708,7 +708,7 @@ namespace { // position + edge extern const GrVertexAttrib gHairlineBezierAttribs[] = { {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding}, - {kVec4f_GrVertexAttribType, sizeof(SkPoint), kEffect_GrVertexAttribBinding} + {kVec4f_GrVertexAttribType, sizeof(SkPoint), kGeometryProcessor_GrVertexAttribBinding} }; // position + coverage @@ -995,12 +995,12 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path, kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt)); if (quadCnt > 0) { - GrEffect* hairQuadEffect = GrQuadEffect::Create(kHairlineAA_GrEffectEdgeType, - *target->caps()); - SkASSERT(hairQuadEffect); + GrGeometryProcessor* hairQuadProcessor = + GrQuadEffect::Create(kHairlineAA_GrProcessorEdgeType, *target->caps()); + SkASSERT(hairQuadProcessor); GrDrawState::AutoRestoreEffects are(drawState); target->setIndexSourceToBuffer(fQuadsIndexBuffer); - drawState->setGeometryProcessor(hairQuadEffect)->unref(); + drawState->setGeometryProcessor(hairQuadProcessor)->unref(); int quads = 0; while (quads < quadCnt) { int n = SkTMin(quadCnt - quads, kNumQuadsInIdxBuffer); @@ -1016,10 +1016,10 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path, if (conicCnt > 0) { GrDrawState::AutoRestoreEffects are(drawState); - GrEffect* hairConicEffect = GrConicEffect::Create(kHairlineAA_GrEffectEdgeType, - *target->caps()); - SkASSERT(hairConicEffect); - drawState->setGeometryProcessor(hairConicEffect)->unref(); + GrGeometryProcessor* hairConicProcessor = GrConicEffect::Create( + kHairlineAA_GrProcessorEdgeType, *target->caps()); + SkASSERT(hairConicProcessor); + drawState->setGeometryProcessor(hairConicProcessor)->unref(); int conics = 0; while (conics < conicCnt) { int n = SkTMin(conicCnt - conics, kNumQuadsInIdxBuffer); |