| Index: src/gpu/effects/GrSimpleTextureEffect.cpp
|
| diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp
|
| index 74926bc1455aa1c556e439d65b1c34d871018d94..fe55ce9c7c86d4a2b4ad6510668bd48e5954e5a9 100644
|
| --- a/src/gpu/effects/GrSimpleTextureEffect.cpp
|
| +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp
|
| @@ -5,9 +5,9 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| +#include "gl/builders/GrGLProgramBuilder.h"
|
| #include "GrSimpleTextureEffect.h"
|
| #include "gl/GrGLEffect.h"
|
| -#include "gl/GrGLShaderBuilder.h"
|
| #include "gl/GrGLSL.h"
|
| #include "gl/GrGLTexture.h"
|
| #include "GrTBackendEffectFactory.h"
|
| @@ -19,19 +19,20 @@ public:
|
| : INHERITED (factory) {
|
| }
|
|
|
| - virtual void emitCode(GrGLShaderBuilder* builder,
|
| + virtual void emitCode(GrGLProgramBuilder* builder,
|
| const GrDrawEffect& drawEffect,
|
| const GrEffectKey& key,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray& coords,
|
| const TextureSamplerArray& samplers) SK_OVERRIDE {
|
| - builder->fsCodeAppendf("\t%s = ", outputColor);
|
| - builder->fsAppendTextureLookupAndModulate(inputColor,
|
| + GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();
|
| + fsBuilder->codeAppendf("\t%s = ", outputColor);
|
| + fsBuilder->appendTextureLookupAndModulate(inputColor,
|
| samplers[0],
|
| coords[0].c_str(),
|
| coords[0].type());
|
| - builder->fsCodeAppend(";\n");
|
| + fsBuilder->codeAppend(";\n");
|
| }
|
|
|
| private:
|
|
|