diff options
| author |  bsalomon <bsalomon@google.com> | 2016-09-12 12:56:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-12 12:56:58 -0700 |
| commit | 790c90b20e4e28f19e3e2a73d5f9315980fd45c1 (patch) | |
| tree | 238efd2840b9ecba022407c5a350eb9dad398ad8 /src/gpu | |
| parent | df5df81084a9b8652e6ed0987c2454c62d787188 (diff) | |
Remove base class for installed transforms in GrPrimitiveProcessor
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2336723002
Review-Url: https://codereview.chromium.org/2336723002
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrPathProcessor.cpp | 9 | ||||
| -rw-r--r-- | src/gpu/glsl/GrGLSLGeometryProcessor.h | 8 | ||||
| -rw-r--r-- | src/gpu/glsl/GrGLSLPrimitiveProcessor.h | 6 |
3 files changed, 9 insertions, 14 deletions
diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp index 5a873d420d..aa776ec2fb 100644 --- a/src/gpu/GrPathProcessor.cpp +++ b/src/gpu/GrPathProcessor.cpp @@ -96,7 +96,7 @@ public: int index, const SkTArray<const GrCoordTransform*, true>& coordTransforms) override { const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>(); - SkSTArray<2, VaryingTransform, true>& transforms = fInstalledTransforms[index]; + SkTArray<TransformVarying, true>& transforms = fInstalledTransforms[index]; int numTransforms = transforms.count(); for (int t = 0; t < numTransforms; ++t) { SkASSERT(transforms[t].fHandle.isValid()); @@ -116,12 +116,13 @@ public: private: typedef GrGLSLProgramDataManager::VaryingHandle VaryingHandle; - struct VaryingTransform : public Transform { - VaryingTransform() : Transform() {} + struct TransformVarying { VaryingHandle fHandle; + SkMatrix fCurrentValue = SkMatrix::InvalidMatrix(); + GrSLType fType = kVoid_GrSLType; }; - SkSTArray<8, SkSTArray<2, VaryingTransform, true> > fInstalledTransforms; + SkSTArray<8, SkSTArray<2, TransformVarying, true> > fInstalledTransforms; UniformHandle fColorUniform; GrColor fColor; diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h index 00652a5b99..d403c8fc7f 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; }; diff --git a/src/gpu/glsl/GrGLSLPrimitiveProcessor.h b/src/gpu/glsl/GrGLSLPrimitiveProcessor.h index 64531aaedc..6f3381f996 100644 --- a/src/gpu/glsl/GrGLSLPrimitiveProcessor.h +++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.h @@ -100,12 +100,6 @@ protected: GrGLSLUniformHandler* uniformHandler, const char* outputName, UniformHandle* colorUniform); - - struct Transform { - Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidMatrix(); } - SkMatrix fCurrentValue; - GrSLType fType; - }; }; #endif |