Index: src/gpu/effects/GrTextureDomain.cpp |
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp |
index 5af5bc86f3a95eb339a7bc824fa114234f8f5eb5..64ed3dc7fc5c313564b4b5db0962095232ecfcd6 100644 |
--- a/src/gpu/effects/GrTextureDomain.cpp |
+++ b/src/gpu/effects/GrTextureDomain.cpp |
@@ -112,7 +112,7 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLShaderBuilder* builder, |
} |
} |
-void GrTextureDomain::GLDomain::setData(const GrGLUniformManager& uman, |
+void GrTextureDomain::GLDomain::setData(const GrGLProgramResourceManager& prman, |
const GrTextureDomain& textureDomain, |
GrSurfaceOrigin textureOrigin) { |
SkASSERT(textureDomain.mode() == fMode); |
@@ -132,7 +132,7 @@ void GrTextureDomain::GLDomain::setData(const GrGLUniformManager& uman, |
SkTSwap(values[1], values[3]); |
} |
if (0 != memcmp(values, fPrevDomain, 4 * sizeof(GrGLfloat))) { |
- uman.set4fv(fDomainUni, 1, values); |
+ prman.set4fv(fDomainUni, 1, values); |
memcpy(fPrevDomain, values, 4 * sizeof(GrGLfloat)); |
} |
} |
@@ -153,7 +153,7 @@ public: |
const TransformedCoordsArray&, |
const TextureSamplerArray&) SK_OVERRIDE; |
- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; |
+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE; |
static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*); |
@@ -181,11 +181,11 @@ void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder, |
fGLDomain.sampleTexture(builder, domain, outputColor, coords2D, samplers[0], inputColor); |
} |
-void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman, |
+void GrGLTextureDomainEffect::setData(const GrGLProgramResourceManager& prman, |
const GrDrawEffect& drawEffect) { |
const GrTextureDomainEffect& effect = drawEffect.castEffect<GrTextureDomainEffect>(); |
const GrTextureDomain& domain = effect.textureDomain(); |
- fGLDomain.setData(uman, domain, effect.texture(0)->origin()); |
+ fGLDomain.setData(prman, domain, effect.texture(0)->origin()); |
} |
void GrGLTextureDomainEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, |