Break apart shared use of varying and uniform transforms

src/gpu/GrPathProcessor.cpp

 /*
 * Copyright 2013 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrPathProcessor.h"
 
 #include "gl/GrGLGpu.h"
@@ skipping 79 matching lines @@
             pd.set4fv(fColorUniform, 1, c);
             fColor = pathProc.color();
         }
     }
 
     void setTransformData(const GrPrimitiveProcessor& primProc,
                           const GrGLSLProgramDataManager& pdman,
                           int index,
                           const SkTArray<const GrCoordTransform*, true>& coordTransforms) override {
         const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
-        SkSTArray<2, Transform, true>& transforms = fInstalledTransforms[index];
+        SkSTArray<2, VaryingTransform, true>& transforms = fInstalledTransforms[index];
         int numTransforms = transforms.count();
         for (int t = 0; t < numTransforms; ++t) {
             SkASSERT(transforms[t].fHandle.isValid());
             const SkMatrix& transform = GetTransformMatrix(pathProc.localMatrix(),
                                                            *coordTransforms[t]);
             if (transforms[t].fCurrentValue.cheapEqualTo(transform)) {
                 continue;
             }
             transforms[t].fCurrentValue = transform;
 
             SkASSERT(transforms[t].fType == kVec2f_GrSLType ||
                      transforms[t].fType == kVec3f_GrSLType);
             unsigned components = transforms[t].fType == kVec2f_GrSLType ? 2 : 3;
             pdman.setPathFragmentInputTransform(transforms[t].fHandle, components, transform);
         }
     }
 
 private:
+    typedef GrGLSLProgramDataManager::VaryingHandle VaryingHandle;

[robertphillips, 2016/05/09 16:51:28]

init fHandle here ?

[egdaniel, 2016/05/09 16:59:05]

The default ctor of a ResourceHandle sets the handle to invalid, so it should be
doing what we want as it.

+    struct VaryingTransform : public Transform {
+        VaryingTransform() : Transform() {}
+        VaryingHandle  fHandle;
+    };
+
+    SkSTArray<8, SkSTArray<2, VaryingTransform, true> > fInstalledTransforms;
+
     UniformHandle fColorUniform;
     GrColor fColor;
 
     typedef GrGLSLPrimitiveProcessor INHERITED;
 };
 
 GrPathProcessor::GrPathProcessor(GrColor color,
                                  const GrXPOverridesForBatch& overrides,
                                  const SkMatrix& viewMatrix,
                                  const SkMatrix& localMatrix)
     : fColor(color)
     , fViewMatrix(viewMatrix)
     , fLocalMatrix(localMatrix)
     , fOverrides(overrides) {
     this->initClassID<GrPathProcessor>();
 }
 
 void GrPathProcessor::getGLSLProcessorKey(const GrGLSLCaps& caps,
                                           GrProcessorKeyBuilder* b) const {
     GrGLPathProcessor::GenKey(*this, caps, b);
 }
 
 GrGLSLPrimitiveProcessor* GrPathProcessor::createGLSLInstance(const GrGLSLCaps& caps) const {
     SkASSERT(caps.pathRenderingSupport());
     return new GrGLPathProcessor();
 }