Index: src/gpu/glsl/GrGLSLPrimitiveProcessor.h |
diff --git a/src/gpu/glsl/GrGLSLPrimitiveProcessor.h b/src/gpu/glsl/GrGLSLPrimitiveProcessor.h |
index 4bd5fefd9f4d93c80cbfe75957fc441fe5a04fc9..3bb1db95947485acaab22b217da9519ef145bd12 100644 |
--- a/src/gpu/glsl/GrGLSLPrimitiveProcessor.h |
+++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.h |
@@ -27,7 +27,7 @@ public: |
virtual ~GrGLSLPrimitiveProcessor() {} |
typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; |
- typedef GrGLSLSampler::SamplerArray SamplerArray; |
+ typedef GrGLSLProgramDataManager::UniformHandle SamplerHandle; |
typedef SkSTArray<2, const GrCoordTransform*, true> ProcCoords; |
typedef SkSTArray<8, ProcCoords> TransformsIn; |
@@ -42,8 +42,8 @@ public: |
const GrPrimitiveProcessor& gp, |
const char* outputColor, |
const char* outputCoverage, |
- const SamplerArray& texSamplers, |
- const SamplerArray& bufferSamplers, |
+ const SamplerHandle* texSamplers, |
+ const SamplerHandle* bufferSamplers, |
const TransformsIn& transformsIn, |
TransformsOut* transformsOut) |
: fVertBuilder(vertBuilder) |
@@ -66,8 +66,8 @@ public: |
const GrPrimitiveProcessor& fGP; |
const char* fOutputColor; |
const char* fOutputCoverage; |
- const SamplerArray& fTexSamplers; |
- const SamplerArray& fBufferSamplers; |
+ const SamplerHandle* fTexSamplers; |
+ const SamplerHandle* fBufferSamplers; |
const TransformsIn& fTransformsIn; |
TransformsOut* fTransformsOut; |
}; |