Start trying to collapse path program stuff

src/gpu/gl/GrGLPrimitiveProcessor.h

Index: src/gpu/gl/GrGLPrimitiveProcessor.h
diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/gl/GrGLPrimitiveProcessor.h
index 4f2a4848b4f00600068787b4cab44da9273376a8..4e7f913b18db806c9e6c605961af6a1e68bec36b 100644
--- a/src/gpu/gl/GrGLPrimitiveProcessor.h
+++ b/src/gpu/gl/GrGLPrimitiveProcessor.h
@@ -72,28 +72,9 @@ public:
 protected:
     void setupUniformColor(GrGLGPBuilder* pb, const char* outputName, UniformHandle* colorUniform);
 
-    class ShaderVarHandle {
-    public:
-        bool isValid() const { return fHandle > -1; }
-        ShaderVarHandle() : fHandle(-1) {}
-        ShaderVarHandle(int value) : fHandle(value) { SkASSERT(this->isValid()); }
-        int handle() const { SkASSERT(this->isValid()); return fHandle; }
-        UniformHandle convertToUniformHandle() {
-            SkASSERT(this->isValid());
-            return GrGLProgramDataManager::UniformHandle::CreateFromUniformIndex(fHandle);
-        }
-        SeparableVaryingHandle convertToSeparableVaryingHandle() {
-            SkASSERT(this->isValid());
-            return SeparableVaryingHandle::CreateFromSeparableVaryingIndex(fHandle);
-        }
-
-    private:
-        int fHandle;
-    };
-
     struct Transform {
         Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidMatrix(); }
-        ShaderVarHandle fHandle;
+        GrGLProgramDataManager::UniformHandle fHandle;

[bsalomon, 2015/09/11 17:16:17]

align

         SkMatrix       fCurrentValue;
         GrSLType       fType;
     };