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

diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index 5a873d4..aa776ec 100644 (file)
--- 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 00652a5..d403c8f 100644 (file)
--- 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 64531aa..6f3381f 100644 (file)
--- 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