Index: src/gpu/glsl/GrGLSLGeometryProcessor.h |
diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h |
index 00652a5b99bd2b07834ea55f5e0f4f0bd7a2ff67..d403c8fc7fc195bd25a0c642ba5b192a1bd1f859 100644 |
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.h |
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.h |
@@ -36,7 +36,7 @@ protected: |
const GrGLSLProgramDataManager& pdman, |
int index, |
const SkTArray<const GrCoordTransform*, true>& transforms) { |
- SkSTArray<2, UniformTransform, true>& procTransforms = fInstalledTransforms[index]; |
+ SkTArray<TransformUniform, true>& procTransforms = fInstalledTransforms[index]; |
int numTransforms = transforms.count(); |
for (int t = 0; t < numTransforms; ++t) { |
SkASSERT(procTransforms[t].fHandle.isValid()); |
@@ -105,12 +105,12 @@ protected: |
private: |
virtual void onEmitCode(EmitArgs&, GrGPArgs*) = 0; |
- struct UniformTransform : public Transform { |
- UniformTransform() : Transform() {} |
+ struct TransformUniform { |
UniformHandle fHandle; |
+ SkMatrix fCurrentValue = SkMatrix::InvalidMatrix(); |
}; |
- SkSTArray<8, SkSTArray<2, UniformTransform, true> > fInstalledTransforms; |
+ SkSTArray<8, SkSTArray<2, TransformUniform, true> > fInstalledTransforms; |
typedef GrGLSLPrimitiveProcessor INHERITED; |
}; |