| Index: src/gpu/glsl/GrGLSLProgramBuilder.h
|
| diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| index 952db7e09b7be294eca8154fe80d916c98dbd6de..4d253c73bf6b443fda1a1bd7c2e16e976cb368b2 100644
|
| --- a/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| @@ -15,7 +15,7 @@
|
| #include "glsl/GrGLSLPrimitiveProcessor.h"
|
| #include "glsl/GrGLSLProgramDataManager.h"
|
| #include "glsl/GrGLSLUniformHandler.h"
|
| -#include "glsl/GrGLSLTextureSampler.h"
|
| +#include "glsl/GrGLSLSampler.h"
|
| #include "glsl/GrGLSLVertexShaderBuilder.h"
|
| #include "glsl/GrGLSLXferProcessor.h"
|
|
|
| @@ -146,8 +146,7 @@ private:
|
| const GrGLSLExpr4& coverageIn,
|
| bool ignoresCoverage,
|
| GrPixelLocalStorageState plsState);
|
| - void emitSamplers(const GrProcessor& processor,
|
| - GrGLSLTextureSampler::TextureSamplerArray* outSamplers);
|
| + void emitSamplers(const GrProcessor& processor, GrGLSLSampler::SamplerArray* outTexSamplers);
|
| void emitFSOutputSwizzle(bool hasSecondaryOutput);
|
| bool checkSamplerCounts();
|
|
|
|
|