diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrProcessor.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrProcessor.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 4294c9fae6..8f8e7979bb 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -54,7 +54,7 @@ SkTArray<GrXPFactoryTestFactory*, true>* GrXPFactoryTestFactory::GetFactories() * we verify the count is as expected. If a new factory is added, then these numbers must be * manually adjusted. */ -static const int kFPFactoryCount = 42; +static const int kFPFactoryCount = 38; static const int kGPFactoryCount = 14; static const int kXPFactoryCount = 4; diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h index 5947f9fe27..0736d036cd 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/GrProcessor.h @@ -69,8 +69,6 @@ public: kBlockInputFragmentProcessor_ClassID, kCCPRClipProcessor_ClassID, kCircleGeometryProcessor_ClassID, - kCircleInside2PtConicalEffect_ClassID, - kCircleOutside2PtConicalEffect_ClassID, kCircularRRectEffect_ClassID, kColorMatrixEffect_ClassID, kColorTableEffect_ClassID, @@ -83,11 +81,9 @@ public: kDefaultGeoProc_ClassID, kDIEllipseGeometryProcessor_ClassID, kDisableColorXP_ClassID, - kEdge2PtConicalEffect_ClassID, + kTwoPointConicalEffect_ClassID, kEllipseGeometryProcessor_ClassID, kEllipticalRRectEffect_ClassID, - kFocalInside2PtConicalEffect_ClassID, - kFocalOutside2PtConicalEffect_ClassID, kGP_ClassID, kGrAARectEffect_ClassID, kGrAlphaThresholdFragmentProcessor_ClassID, |