Index: src/gpu/glsl/GrGLSLXferProcessor.h |
diff --git a/src/gpu/glsl/GrGLSLXferProcessor.h b/src/gpu/glsl/GrGLSLXferProcessor.h |
index 478956df3477b9dcf1a712bb262aa4299da489a2..3f190ce82f0706df380dd3da6639a903b417f73d 100644 |
--- a/src/gpu/glsl/GrGLSLXferProcessor.h |
+++ b/src/gpu/glsl/GrGLSLXferProcessor.h |
@@ -9,7 +9,7 @@ |
#define GrGLSLXferProcessor_DEFINED |
#include "glsl/GrGLSLProgramDataManager.h" |
-#include "glsl/GrGLSLTextureSampler.h" |
+#include "glsl/GrGLSLSampler.h" |
class GrXferProcessor; |
class GrGLSLCaps; |
@@ -22,7 +22,7 @@ public: |
GrGLSLXferProcessor() {} |
virtual ~GrGLSLXferProcessor() {} |
- typedef GrGLSLTextureSampler::TextureSamplerArray TextureSamplerArray; |
+ typedef GrGLSLSampler::SamplerArray SamplerArray; |
struct EmitArgs { |
EmitArgs(GrGLSLXPFragmentBuilder* fragBuilder, |
GrGLSLUniformHandler* uniformHandler, |
@@ -32,7 +32,7 @@ public: |
const char* inputCoverage, |
const char* outputPrimary, |
const char* outputSecondary, |
- const TextureSamplerArray& samplers, |
+ const SamplerArray& texSamplers, |
const bool usePLSDstRead) |
: fXPFragBuilder(fragBuilder) |
, fUniformHandler(uniformHandler) |
@@ -42,7 +42,7 @@ public: |
, fInputCoverage(inputCoverage) |
, fOutputPrimary(outputPrimary) |
, fOutputSecondary(outputSecondary) |
- , fSamplers(samplers) |
+ , fTexSamplers(texSamplers) |
, fUsePLSDstRead(usePLSDstRead) {} |
GrGLSLXPFragmentBuilder* fXPFragBuilder; |
@@ -53,7 +53,7 @@ public: |
const char* fInputCoverage; |
const char* fOutputPrimary; |
const char* fOutputSecondary; |
- const TextureSamplerArray& fSamplers; |
+ const SamplerArray& fTexSamplers; |
bool fUsePLSDstRead; |
}; |
/** |