Index: src/gpu/effects/GrTextureDomain.cpp |
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp |
index 31f51aad2224e83aa25728ebbd5d86d64b170f07..73eb8ff8ef9d1cefe6657883363470b316f76512 100644 |
--- a/src/gpu/effects/GrTextureDomain.cpp |
+++ b/src/gpu/effects/GrTextureDomain.cpp |
@@ -218,7 +218,8 @@ void GrGLTextureDomainEffect::GenKey(const GrProcessor& processor, const GrGLSLC |
/////////////////////////////////////////////////////////////////////////////// |
-GrFragmentProcessor* GrTextureDomainEffect::Create(GrTexture* texture, |
+GrFragmentProcessor* GrTextureDomainEffect::Create(GrProcessorDataManager* procDataManager, |
+ GrTexture* texture, |
const SkMatrix& matrix, |
const SkRect& domain, |
GrTextureDomain::Mode mode, |
@@ -227,10 +228,11 @@ GrFragmentProcessor* GrTextureDomainEffect::Create(GrTexture* texture, |
static const SkRect kFullRect = {0, 0, SK_Scalar1, SK_Scalar1}; |
if (GrTextureDomain::kIgnore_Mode == mode || |
(GrTextureDomain::kClamp_Mode == mode && domain.contains(kFullRect))) { |
- return GrSimpleTextureEffect::Create(texture, matrix, filterMode); |
+ return GrSimpleTextureEffect::Create(procDataManager, texture, matrix, filterMode); |
} else { |
- return SkNEW_ARGS(GrTextureDomainEffect, (texture, |
+ return SkNEW_ARGS(GrTextureDomainEffect, (procDataManager, |
+ texture, |
matrix, |
domain, |
mode, |
@@ -239,13 +241,14 @@ GrFragmentProcessor* GrTextureDomainEffect::Create(GrTexture* texture, |
} |
} |
-GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture, |
+GrTextureDomainEffect::GrTextureDomainEffect(GrProcessorDataManager* procDataManager, |
+ GrTexture* texture, |
const SkMatrix& matrix, |
const SkRect& domain, |
GrTextureDomain::Mode mode, |
GrTextureParams::FilterMode filterMode, |
GrCoordSet coordSet) |
- : GrSingleTextureEffect(texture, matrix, filterMode, coordSet) |
+ : GrSingleTextureEffect(procDataManager, texture, matrix, filterMode, coordSet) |
, fTextureDomain(domain, mode) { |
SkASSERT(mode != GrTextureDomain::kRepeat_Mode || |
filterMode == GrTextureParams::kNone_FilterMode); |
@@ -299,7 +302,8 @@ GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData* d) { |
const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom); |
bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? d->fRandom->nextBool() : false; |
GrCoordSet coords = d->fRandom->nextBool() ? kLocal_GrCoordSet : kDevice_GrCoordSet; |
- return GrTextureDomainEffect::Create(d->fTextures[texIdx], |
+ return GrTextureDomainEffect::Create(d->fProcDataManager, |
+ d->fTextures[texIdx], |
matrix, |
domain, |
mode, |