diff options
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 10 | ||||
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrDashingEffect.cpp | 4 | ||||
| -rwxr-xr-x | src/gpu/effects/GrDistanceFieldGeoProc.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrTextureDomain.cpp | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index cb440d4bb0..6eeda90cdd 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -236,9 +236,9 @@ GrGeometryProcessor* GrConicEffect::TestCreate(SkRandom* random, do { GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>( random->nextULessThan(kGrProcessorEdgeTypeCnt)); - gp = GrConicEffect::Create(GrRandomColor(random), GrProcessorUnitTest::TestMatrix(random), + gp = GrConicEffect::Create(GrRandomColor(random), GrTest::TestMatrix(random), edgeType, caps, - GrProcessorUnitTest::TestMatrix(random)); + GrTest::TestMatrix(random)); } while (NULL == gp); return gp; } @@ -458,9 +458,9 @@ GrGeometryProcessor* GrQuadEffect::TestCreate(SkRandom* random, GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>( random->nextULessThan(kGrProcessorEdgeTypeCnt)); gp = GrQuadEffect::Create(GrRandomColor(random), - GrProcessorUnitTest::TestMatrix(random), + GrTest::TestMatrix(random), edgeType, caps, - GrProcessorUnitTest::TestMatrix(random)); + GrTest::TestMatrix(random)); } while (NULL == gp); return gp; } @@ -698,7 +698,7 @@ GrGeometryProcessor* GrCubicEffect::TestCreate(SkRandom* random, GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>( random->nextULessThan(kGrProcessorEdgeTypeCnt)); gp = GrCubicEffect::Create(GrRandomColor(random), - GrProcessorUnitTest::TestMatrix(random), edgeType, caps); + GrTest::TestMatrix(random), edgeType, caps); } while (NULL == gp); return gp; } diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 7cce1df201..9834a7687a 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -232,5 +232,5 @@ GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(SkRandom* random, return GrBitmapTextGeoProc::Create(GrRandomColor(random), textures[texIdx], params, format, random->nextBool(), - GrProcessorUnitTest::TestMatrix(random)); + GrTest::TestMatrix(random)); } diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index e536c8fadf..6ee0c966aa 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -142,7 +142,7 @@ GrFragmentProcessor* GrConfigConversionEffect::TestCreate(SkRandom* random, (textures[GrProcessorUnitTest::kSkiaPMTextureIdx], swapRB, pmConv, - GrProcessorUnitTest::TestMatrix(random))); + GrTest::TestMatrix(random))); } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 08a3f670d9..b729d0a698 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -1002,7 +1002,7 @@ GrGeometryProcessor* DashingCircleEffect::TestCreate(SkRandom* random, GrTexture*[]) { DashAAMode aaMode = static_cast<DashAAMode>(random->nextULessThan(kDashAAModeCount)); return DashingCircleEffect::Create(GrRandomColor(random), - aaMode, GrProcessorUnitTest::TestMatrix(random)); + aaMode, GrTest::TestMatrix(random)); } ////////////////////////////////////////////////////////////////////////////// @@ -1261,7 +1261,7 @@ GrGeometryProcessor* DashingLineEffect::TestCreate(SkRandom* random, GrTexture*[]) { DashAAMode aaMode = static_cast<DashAAMode>(random->nextULessThan(kDashAAModeCount)); return DashingLineEffect::Create(GrRandomColor(random), - aaMode, GrProcessorUnitTest::TestMatrix(random)); + aaMode, GrTest::TestMatrix(random)); } ////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index c15d45b588..719ea50b55 100755 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -283,7 +283,7 @@ GrGeometryProcessor* GrDistanceFieldA8TextGeoProc::TestCreate(SkRandom* random, GrTextureParams::kNone_FilterMode); return GrDistanceFieldA8TextGeoProc::Create(GrRandomColor(random), - GrProcessorUnitTest::TestMatrix(random), + GrTest::TestMatrix(random), textures[texIdx], params, #ifdef SK_GAMMA_APPLY_TO_A8 random->nextF(), @@ -528,7 +528,7 @@ GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(SkRandom* random, : GrTextureParams::kNone_FilterMode); return GrDistanceFieldPathGeoProc::Create(GrRandomColor(random), - GrProcessorUnitTest::TestMatrix(random), + GrTest::TestMatrix(random), textures[texIdx], params, random->nextBool() ? kSimilarity_DistanceFieldEffectFlag : 0, random->nextBool()); @@ -818,7 +818,7 @@ GrGeometryProcessor* GrDistanceFieldLCDTextGeoProc::TestCreate(SkRandom* random, flags |= random->nextBool() ? kUniformScale_DistanceFieldEffectMask : 0; flags |= random->nextBool() ? kBGR_DistanceFieldEffectFlag : 0; return GrDistanceFieldLCDTextGeoProc::Create(GrRandomColor(random), - GrProcessorUnitTest::TestMatrix(random), + GrTest::TestMatrix(random), textures[texIdx], params, wa, flags); diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index abbd89cafa..2fe6dfe1a4 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -80,6 +80,6 @@ GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(SkRandom* random, }; GrCoordSet coordSet = kCoordSets[random->nextULessThan(SK_ARRAY_COUNT(kCoordSets))]; - const SkMatrix& matrix = GrProcessorUnitTest::TestMatrix(random); + const SkMatrix& matrix = GrTest::TestMatrix(random); return GrSimpleTextureEffect::Create(textures[texIdx], matrix, coordSet); } diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp index 45b5546c1b..3c4f348283 100644 --- a/src/gpu/effects/GrTextureDomain.cpp +++ b/src/gpu/effects/GrTextureDomain.cpp @@ -299,7 +299,7 @@ GrFragmentProcessor* GrTextureDomainEffect::TestCreate(SkRandom* random, domain.fBottom = random->nextRangeScalar(domain.fTop, SK_Scalar1); GrTextureDomain::Mode mode = (GrTextureDomain::Mode) random->nextULessThan(GrTextureDomain::kModeCount); - const SkMatrix& matrix = GrProcessorUnitTest::TestMatrix(random); + const SkMatrix& matrix = GrTest::TestMatrix(random); bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? random->nextBool() : false; GrCoordSet coords = random->nextBool() ? kLocal_GrCoordSet : kDevice_GrCoordSet; return GrTextureDomainEffect::Create(textures[texIdx], |