| Index: src/gpu/effects/GrTextureDomain.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
|
| index d3850a31c24041021c02f8770dc926bad2ecb6d9..d838f106c8d24ece8f1573366982efd68a5a7a37 100644
|
| --- a/src/gpu/effects/GrTextureDomain.cpp
|
| +++ b/src/gpu/effects/GrTextureDomain.cpp
|
| @@ -12,8 +12,8 @@
|
| #include "glsl/GrGLSLFragmentProcessor.h"
|
| #include "glsl/GrGLSLFragmentShaderBuilder.h"
|
| #include "glsl/GrGLSLProgramDataManager.h"
|
| +#include "glsl/GrGLSLSampler.h"
|
| #include "glsl/GrGLSLShaderBuilder.h"
|
| -#include "glsl/GrGLSLTextureSampler.h"
|
| #include "glsl/GrGLSLUniformHandler.h"
|
|
|
| GrTextureDomain::GrTextureDomain(const SkRect& domain, Mode mode, int index)
|
| @@ -49,7 +49,7 @@ void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder,
|
| const GrTextureDomain& textureDomain,
|
| const char* outColor,
|
| const SkString& inCoords,
|
| - const GrGLSLTextureSampler& sampler,
|
| + const GrGLSLSampler& sampler,
|
| const char* inModulateColor) {
|
| SkASSERT((Mode)-1 == fMode || textureDomain.mode() == fMode);
|
| SkDEBUGCODE(fMode = textureDomain.mode();)
|
| @@ -200,7 +200,7 @@ void GrGLTextureDomainEffect::emitCode(EmitArgs& args) {
|
| domain,
|
| args.fOutputColor,
|
| coords2D,
|
| - args.fSamplers[0],
|
| + args.fTexSamplers[0],
|
| args.fInputColor);
|
| }
|
|
|
|
|