rename GrDrawTargetCaps to GrCaps
Review URL: https://codereview.chromium.org/1133123009
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index 8d1b0db..5825580 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -211,7 +211,7 @@
GrGeometryProcessor* GrConicEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
GrGeometryProcessor* gp;
do {
@@ -412,7 +412,7 @@
GrGeometryProcessor* GrQuadEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
GrGeometryProcessor* gp;
do {
@@ -625,7 +625,7 @@
GrGeometryProcessor* GrCubicEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
GrGeometryProcessor* gp;
do {
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 7700c58..d335c71 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -61,7 +61,7 @@
static GrGeometryProcessor* Create(GrColor color,
const SkMatrix& viewMatrix,
const GrPrimitiveEdgeType edgeType,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
const SkMatrix& localMatrix,
bool usesLocalCoords,
uint8_t coverage = 0xff) {
@@ -146,7 +146,7 @@
static GrGeometryProcessor* Create(GrColor color,
const SkMatrix& viewMatrix,
const GrPrimitiveEdgeType edgeType,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
const SkMatrix& localMatrix,
bool usesLocalCoords,
uint8_t coverage = 0xff) {
@@ -233,7 +233,7 @@
static GrGeometryProcessor* Create(GrColor color,
const SkMatrix& viewMatrix,
const GrPrimitiveEdgeType edgeType,
- const GrDrawTargetCaps& caps) {
+ const GrCaps& caps) {
switch (edgeType) {
case kFillAA_GrProcessorEdgeType:
if (!caps.shaderCaps()->shaderDerivativeSupport()) {
diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/effects/GrBicubicEffect.cpp
index 9176972..5d94bd9 100644
--- a/src/gpu/effects/GrBicubicEffect.cpp
+++ b/src/gpu/effects/GrBicubicEffect.cpp
@@ -182,7 +182,7 @@
GrFragmentProcessor* GrBicubicEffect::TestCreate(SkRandom* random,
GrContext* context,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index ad06792..2e09dd3 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -155,7 +155,7 @@
GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index 8b75a88..9a6f9fc 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -129,7 +129,7 @@
GrFragmentProcessor* GrConfigConversionEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
PMConversion pmConv = static_cast<PMConversion>(random->nextULessThan(kPMConversionCnt));
bool swapRB;
diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp
index ab703fd..5f8ad38 100644
--- a/src/gpu/effects/GrConstColorProcessor.cpp
+++ b/src/gpu/effects/GrConstColorProcessor.cpp
@@ -107,7 +107,7 @@
GrFragmentProcessor* GrConstColorProcessor::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture*[]) {
GrColor color;
int colorPicker = random->nextULessThan(3);
diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
index 2ad4ce0..0cef3fa 100644
--- a/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -63,7 +63,7 @@
GrFragmentProcessor* AARectEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
SkRect rect = SkRect::MakeLTRB(random->nextSScalar1(),
random->nextSScalar1(),
@@ -363,7 +363,7 @@
GrFragmentProcessor* GrConvexPolyEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
int count = random->nextULessThan(kMaxEdges) + 1;
SkScalar edges[kMaxEdges * 3];
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index 3d96a00..4124d5b 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -220,7 +220,7 @@
GrFragmentProcessor* GrConvolutionEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp
index 02552b3..8c4f0bc 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.cpp
+++ b/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -38,7 +38,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* color,
- const GrDrawTargetCaps& caps) override;
+ const GrCaps& caps) override;
void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
@@ -112,7 +112,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* color,
- const GrDrawTargetCaps& caps) {
+ const GrCaps& caps) {
// We never look at the color input
return GrXferProcessor::kIgnoreColor_OptFlag;
}
@@ -223,7 +223,7 @@
}
GrXferProcessor*
-GrCoverageSetOpXPFactory::onCreateXferProcessor(const GrDrawTargetCaps& caps,
+GrCoverageSetOpXPFactory::onCreateXferProcessor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& covPOI,
const GrDeviceCoordTexture* dstCopy) const {
@@ -252,7 +252,7 @@
GrXPFactory* GrCoverageSetOpXPFactory::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture*[]) {
SkRegion::Op regionOp = SkRegion::Op(random->nextULessThan(SkRegion::kLastOp + 1));
bool invertCoverage = random->nextBool();
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 1fdd3b7..e716ea5 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -495,7 +495,7 @@
GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrCustomXferFP);
GrFragmentProcessor* GrCustomXferFP::TestCreate(SkRandom* rand,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int mode = rand->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
@@ -540,12 +540,12 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* overrideColor,
- const GrDrawTargetCaps& caps) override;
+ const GrCaps& caps) override;
void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
bool onWillNeedXferBarrier(const GrRenderTarget* rt,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrXferBarrierType* outBarrierType) const override;
void onGetBlendInfo(BlendInfo*) const override;
@@ -652,7 +652,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* overrideColor,
- const GrDrawTargetCaps& caps) {
+ const GrCaps& caps) {
/*
Most the optimizations we do here are based on tweaking alpha for coverage.
@@ -764,7 +764,7 @@
}
bool CustomXP::onWillNeedXferBarrier(const GrRenderTarget* rt,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrXferBarrierType* outBarrierType) const {
if (this->hasHWBlendEquation() && !caps.advancedCoherentBlendEquationSupport()) {
*outBarrierType = kBlend_GrXferBarrierType;
@@ -787,14 +787,14 @@
}
GrXferProcessor*
-GrCustomXPFactory::onCreateXferProcessor(const GrDrawTargetCaps& caps,
+GrCustomXPFactory::onCreateXferProcessor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI,
const GrDeviceCoordTexture* dstCopy) const {
return CustomXP::Create(fMode, dstCopy, this->willReadDstColor(caps, colorPOI, coveragePOI));
}
-bool GrCustomXPFactory::willReadDstColor(const GrDrawTargetCaps& caps,
+bool GrCustomXPFactory::willReadDstColor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI) const {
if (!caps.advancedBlendEquationSupport()) {
@@ -818,7 +818,7 @@
GR_DEFINE_XP_FACTORY_TEST(GrCustomXPFactory);
GrXPFactory* GrCustomXPFactory::TestCreate(SkRandom* rand,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture*[]) {
int mode = rand->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
diff --git a/src/gpu/effects/GrCustomXfermodePriv.h b/src/gpu/effects/GrCustomXfermodePriv.h
index 43aaeab..295de26 100644
--- a/src/gpu/effects/GrCustomXfermodePriv.h
+++ b/src/gpu/effects/GrCustomXfermodePriv.h
@@ -68,12 +68,12 @@
GrXPFactory::InvariantOutput*) const override;
private:
- GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps,
+ GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI,
const GrDeviceCoordTexture* dstCopy) const override;
- bool willReadDstColor(const GrDrawTargetCaps& caps,
+ bool willReadDstColor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI) const override;
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
index 8e942a1..8331fc7 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -961,7 +961,7 @@
GrGeometryProcessor* DashingCircleEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
DashAAMode aaMode = static_cast<DashAAMode>(random->nextULessThan(kDashAAModeCount));
return DashingCircleEffect::Create(GrRandomColor(random),
@@ -1199,7 +1199,7 @@
GrGeometryProcessor* DashingLineEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
DashAAMode aaMode = static_cast<DashAAMode>(random->nextULessThan(kDashAAModeCount));
return DashingLineEffect::Create(GrRandomColor(random),
diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp
index 9b513f6..38c8f91 100644
--- a/src/gpu/effects/GrDisableColorXP.cpp
+++ b/src/gpu/effects/GrDisableColorXP.cpp
@@ -36,7 +36,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* color,
- const GrDrawTargetCaps& caps) override {
+ const GrCaps& caps) override {
return GrXferProcessor::kIgnoreColor_OptFlag | GrXferProcessor::kIgnoreCoverage_OptFlag;
}
@@ -100,7 +100,7 @@
}
GrXferProcessor*
-GrDisableColorXPFactory::onCreateXferProcessor(const GrDrawTargetCaps& caps,
+GrDisableColorXPFactory::onCreateXferProcessor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& covPOI,
const GrDeviceCoordTexture* dstCopy) const {
@@ -111,7 +111,7 @@
GrXPFactory* GrDisableColorXPFactory::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture*[]) {
return GrDisableColorXPFactory::Create();
}
diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h
index f5fe4fd..c5ed8f0 100644
--- a/src/gpu/effects/GrDisableColorXP.h
+++ b/src/gpu/effects/GrDisableColorXP.h
@@ -32,12 +32,12 @@
private:
GrDisableColorXPFactory();
- GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps,
+ GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI,
const GrDeviceCoordTexture* dstCopy) const override;
- bool willReadDstColor(const GrDrawTargetCaps& caps,
+ bool willReadDstColor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI) const override {
return false;
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
index 09228e5..1e454a0 100755
--- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -232,7 +232,7 @@
GrGeometryProcessor* GrDistanceFieldA8TextGeoProc::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
@@ -446,7 +446,7 @@
GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx
: GrProcessorUnitTest::kAlphaTextureIdx;
@@ -698,7 +698,7 @@
GrGeometryProcessor* GrDistanceFieldLCDTextGeoProc::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp
index 85116ae..2589c3b 100644
--- a/src/gpu/effects/GrDitherEffect.cpp
+++ b/src/gpu/effects/GrDitherEffect.cpp
@@ -56,7 +56,7 @@
GrFragmentProcessor* DitherEffect::TestCreate(SkRandom*,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture*[]) {
return DitherEffect::Create();
}
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index a705f2b..bb75d54 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -239,7 +239,7 @@
GrFragmentProcessor* GrMatrixConvolutionEffect::TestCreate(SkRandom* random,
GrContext* context,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp
index d387b67..5370611 100644
--- a/src/gpu/effects/GrOvalEffect.cpp
+++ b/src/gpu/effects/GrOvalEffect.cpp
@@ -78,7 +78,7 @@
GrFragmentProcessor* CircleEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
SkPoint center;
center.fX = random->nextRangeScalar(0.f, 1000.f);
@@ -260,7 +260,7 @@
GrFragmentProcessor* EllipseEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
SkPoint center;
center.fX = random->nextRangeScalar(0.f, 1000.f);
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 8b92eba..424fbbf 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -95,7 +95,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* overrideColor,
- const GrDrawTargetCaps& caps) override;
+ const GrCaps& caps) override;
void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
@@ -126,7 +126,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite);
- void calcOutputTypes(GrXferProcessor::OptFlags blendOpts, const GrDrawTargetCaps& caps,
+ void calcOutputTypes(GrXferProcessor::OptFlags blendOpts, const GrCaps& caps,
bool hasSolidCoverage);
GrBlendCoeff fSrcBlend;
@@ -305,7 +305,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* overrideColor,
- const GrDrawTargetCaps& caps) {
+ const GrCaps& caps) {
GrXferProcessor::OptFlags optFlags = this->internalGetOptimizations(colorPOI,
coveragePOI,
doesStencilWrite);
@@ -314,7 +314,7 @@
}
void PorterDuffXferProcessor::calcOutputTypes(GrXferProcessor::OptFlags optFlags,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
bool hasSolidCoverage) {
if (this->willReadDstColor()) {
fPrimaryOutputType = kCustom_PrimaryOutputType;
@@ -484,7 +484,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* overrideColor,
- const GrDrawTargetCaps& caps) override;
+ const GrCaps& caps) override;
void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
@@ -575,7 +575,7 @@
const GrProcOptInfo& coveragePOI,
bool doesStencilWrite,
GrColor* overrideColor,
- const GrDrawTargetCaps& caps) {
+ const GrCaps& caps) {
// We want to force our primary output to be alpha * Coverage, where alpha is the alpha
// value of the blend the constant. We should already have valid blend coeff's if we are at
// a point where we have RGB coverage. We don't need any color stages since the known color
@@ -673,7 +673,7 @@
}
GrXferProcessor*
-GrPorterDuffXPFactory::onCreateXferProcessor(const GrDrawTargetCaps& caps,
+GrPorterDuffXPFactory::onCreateXferProcessor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& covPOI,
const GrDeviceCoordTexture* dstCopy) const {
@@ -763,7 +763,7 @@
output->fWillBlendWithDst = false;
}
-bool GrPorterDuffXPFactory::willReadDstColor(const GrDrawTargetCaps& caps,
+bool GrPorterDuffXPFactory::willReadDstColor(const GrCaps& caps,
const GrProcOptInfo& colorPOI,
const GrProcOptInfo& coveragePOI) const {
// We can always blend correctly if we have dual source blending.
@@ -800,7 +800,7 @@
GrXPFactory* GrPorterDuffXPFactory::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture*[]) {
SkXfermode::Mode mode = SkXfermode::Mode(random->nextULessThan(SkXfermode::kLastCoeffMode));
return GrPorterDuffXPFactory::Create(mode);
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
index 9954b63..bf297fd 100644
--- a/src/gpu/effects/GrRRectEffect.cpp
+++ b/src/gpu/effects/GrRRectEffect.cpp
@@ -110,7 +110,7 @@
GrFragmentProcessor* CircularRRectEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
SkScalar w = random->nextRangeScalar(20.f, 1000.f);
SkScalar h = random->nextRangeScalar(20.f, 1000.f);
@@ -447,7 +447,7 @@
GrFragmentProcessor* EllipticalRRectEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps& caps,
+ const GrCaps& caps,
GrTexture*[]) {
SkScalar w = random->nextRangeScalar(20.f, 1000.f);
SkScalar h = random->nextRangeScalar(20.f, 1000.f);
diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp
index e729b1b..9a5b3a7 100644
--- a/src/gpu/effects/GrSimpleTextureEffect.cpp
+++ b/src/gpu/effects/GrSimpleTextureEffect.cpp
@@ -58,7 +58,7 @@
GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index bd18986..7ac3a18 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -288,7 +288,7 @@
GrFragmentProcessor* GrTextureDomainEffect::TestCreate(SkRandom* random,
GrContext*,
- const GrDrawTargetCaps&,
+ const GrCaps&,
GrTexture* textures[]) {
int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
GrProcessorUnitTest::kAlphaTextureIdx;