Index: src/gpu/glsl/GrGLSLFragmentProcessor.h |
diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.h b/src/gpu/glsl/GrGLSLFragmentProcessor.h |
index ae2d69dbce0be531e321fa5f2a98b111e581ced6..5c71340a1cc8df8cbca72585900da551fcc9f29b 100644 |
--- a/src/gpu/glsl/GrGLSLFragmentProcessor.h |
+++ b/src/gpu/glsl/GrGLSLFragmentProcessor.h |
@@ -8,9 +8,10 @@ |
#ifndef GrGLSLFragmentProcessor_DEFINED |
#define GrGLSLFragmentProcessor_DEFINED |
+#include "GrFragmentProcessor.h" |
#include "glsl/GrGLSLProcessorTypes.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
-#include "glsl/GrGLSLTextureSampler.h" |
+#include "glsl/GrGLSLSampler.h" |
class GrProcessor; |
class GrProcessorKeyBuilder; |
@@ -30,7 +31,7 @@ public: |
} |
typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; |
- typedef GrGLSLTextureSampler::TextureSamplerArray TextureSamplerArray; |
+ typedef GrGLSLSampler::SamplerArray SamplerArray; |
/** Called when the program stage should insert its code into the shaders. The code in each |
shader will be in its own block ({}) and so locally scoped names will not collide across |
@@ -59,7 +60,7 @@ public: |
const char* outputColor, |
const char* inputColor, |
const GrGLSLTransformedCoordsArray& coords, |
- const TextureSamplerArray& samplers) |
+ const SamplerArray& texSamplers) |
: fFragBuilder(fragBuilder) |
, fUniformHandler(uniformHandler) |
, fGLSLCaps(caps) |
@@ -67,7 +68,7 @@ public: |
, fOutputColor(outputColor) |
, fInputColor(inputColor) |
, fCoords(coords) |
- , fSamplers(samplers) {} |
+ , fTexSamplers(texSamplers) {} |
GrGLSLFPFragmentBuilder* fFragBuilder; |
GrGLSLUniformHandler* fUniformHandler; |
const GrGLSLCaps* fGLSLCaps; |
@@ -75,7 +76,7 @@ public: |
const char* fOutputColor; |
const char* fInputColor; |
const GrGLSLTransformedCoordsArray& fCoords; |
- const TextureSamplerArray& fSamplers; |
+ const SamplerArray& fTexSamplers; |
}; |
virtual void emitCode(EmitArgs&) = 0; |