| Index: src/gpu/gl/GrGLPrimitiveProcessor.h
|
| diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/gl/GrGLPrimitiveProcessor.h
|
| index bf1c38869859eba153e683b6b3e10f75d4ba4c4c..cff964037de8e9378e96cb016dd30050f340f01e 100644
|
| --- a/src/gpu/gl/GrGLPrimitiveProcessor.h
|
| +++ b/src/gpu/gl/GrGLPrimitiveProcessor.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "GrPrimitiveProcessor.h"
|
| #include "GrGLProcessor.h"
|
| +#include "glsl/GrGLSLProgramDataManager.h"
|
|
|
| class GrBatchTracker;
|
| class GrPrimitiveProcessor;
|
| @@ -19,7 +20,7 @@ class GrGLPrimitiveProcessor {
|
| public:
|
| virtual ~GrGLPrimitiveProcessor() {}
|
|
|
| - typedef GrGLProgramDataManager::UniformHandle UniformHandle;
|
| + typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
|
| typedef GrGLProcessor::TextureSamplerArray TextureSamplerArray;
|
|
|
| typedef SkSTArray<2, const GrCoordTransform*, true> ProcCoords;
|
| @@ -63,12 +64,12 @@ public:
|
| GrPrimitiveProcessor parameter is guaranteed to be of the same type that created this
|
| GrGLPrimitiveProcessor and to have an identical processor key as the one that created this
|
| GrGLPrimitiveProcessor. */
|
| - virtual void setData(const GrGLProgramDataManager&, const GrPrimitiveProcessor&) = 0;
|
| + virtual void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) = 0;
|
|
|
| static SkMatrix GetTransformMatrix(const SkMatrix& localMatrix, const GrCoordTransform&);
|
|
|
| virtual void setTransformData(const GrPrimitiveProcessor&,
|
| - const GrGLProgramDataManager& pdman,
|
| + const GrGLSLProgramDataManager& pdman,
|
| int index,
|
| const SkTArray<const GrCoordTransform*, true>& transforms) = 0;
|
|
|
| @@ -77,9 +78,9 @@ protected:
|
|
|
| struct Transform {
|
| Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidMatrix(); }
|
| - GrGLProgramDataManager::UniformHandle fHandle;
|
| - SkMatrix fCurrentValue;
|
| - GrSLType fType;
|
| + GrGLSLProgramDataManager::UniformHandle fHandle;
|
| + SkMatrix fCurrentValue;
|
| + GrSLType fType;
|
| };
|
|
|
| SkSTArray<8, SkSTArray<2, Transform, true> > fInstalledTransforms;
|
|
|