Implement NVPR on GLES

src/gpu/gl/GrGLShaderBuilder.h

Index: src/gpu/gl/GrGLShaderBuilder.h
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index 7e71acf901f8e78df6a1bb3c32c89e8c98810b35..724e09fc765c9df71f27e225254afe9c144e994c 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -247,9 +247,6 @@ protected:
 
     const GrGLProgramDesc& desc() const { return fDesc; }
 
-    /** Add input/output variable declarations (i.e. 'varying') to the fragment shader. */
-    GrGLShaderVar& fsInputAppend() { return fFSInputs.push_back(); }
-
     // Helper for emitEffects().
     void createAndEmitEffects(GrGLProgramEffectsBuilder*,
                               const GrEffectStage* effectStages[],
@@ -272,6 +269,8 @@ protected:
     const GenProgramOutput& getOutput() const { return fOutput; }
 
     GenProgramOutput fOutput;
+    VarArray fFSInputs;
+    SkAutoTUnref<GrGLUniformManager> fUniformManager;
 
 private:
     class CodeStage : SkNoncopyable {
@@ -396,11 +395,9 @@ private:
 
     const GrGLProgramDesc&                  fDesc;
     GrGpuGL*                                fGpu;
-    SkAutoTUnref<GrGLUniformManager>        fUniformManager;
     uint32_t                                fFSFeaturesAddedMask;
     SkString                                fFSFunctions;
     SkString                                fFSExtensions;
-    VarArray                                fFSInputs;
     VarArray                                fFSOutputs;
     GrGLUniformManager::BuilderUniformArray fUniforms;
 
@@ -438,10 +435,12 @@ public:
    /** Add a varying variable to the current program to pass values between vertex and fragment
         shaders. If the last two parameters are non-NULL, they are filled in with the name
         generated. */
-    void addVarying(GrSLType type,
-                    const char* name,
-                    const char** vsOutName = NULL,
-                    const char** fsInName = NULL);
+    GrGLUniformManager::FragmentInputHandle addVarying(GrSLType type,
+                                                       const char* name,
+                                                       const char** vsOutName = NULL,
+                                                       const char** fsInName = NULL);
+
+    void addFragmentInput(const char* fsName);
 
     /** Returns a vertex attribute that represents the vertex position in the VS. This is the
         pre-matrix position and is commonly used by effects to compute texture coords via a matrix.