| Index: src/gpu/glsl/GrGLSLShaderBuilder.cpp
|
| diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp
|
| index 93b9f8a57aee00d5754e68e39287e940c398e009..49b5de1f053477ef82533648a66f226d0eaa3fab 100644
|
| --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp
|
| +++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp
|
| @@ -9,7 +9,7 @@
|
| #include "glsl/GrGLSLShaderBuilder.h"
|
| #include "glsl/GrGLSLCaps.h"
|
| #include "glsl/GrGLSLShaderVar.h"
|
| -#include "glsl/GrGLSLTextureSampler.h"
|
| +#include "glsl/GrGLSLSampler.h"
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
|
|
| GrGLSLShaderBuilder::GrGLSLShaderBuilder(GrGLSLProgramBuilder* program)
|
| @@ -57,7 +57,7 @@ void GrGLSLShaderBuilder::emitFunction(GrSLType returnType,
|
| }
|
|
|
| void GrGLSLShaderBuilder::appendTextureLookup(SkString* out,
|
| - const GrGLSLTextureSampler& sampler,
|
| + const GrGLSLSampler& sampler,
|
| const char* coordName,
|
| GrSLType varyingType) const {
|
| const GrGLSLCaps* glslCaps = fProgramBuilder->glslCaps();
|
| @@ -97,14 +97,14 @@ void GrGLSLShaderBuilder::appendTextureLookup(SkString* out,
|
| }
|
| }
|
|
|
| -void GrGLSLShaderBuilder::appendTextureLookup(const GrGLSLTextureSampler& sampler,
|
| +void GrGLSLShaderBuilder::appendTextureLookup(const GrGLSLSampler& sampler,
|
| const char* coordName,
|
| GrSLType varyingType) {
|
| this->appendTextureLookup(&this->code(), sampler, coordName, varyingType);
|
| }
|
|
|
| void GrGLSLShaderBuilder::appendTextureLookupAndModulate(const char* modulation,
|
| - const GrGLSLTextureSampler& sampler,
|
| + const GrGLSLSampler& sampler,
|
| const char* coordName,
|
| GrSLType varyingType) {
|
| SkString lookup;
|
|
|