Incremental refactoring of GrGLProgram and GrGLShaderBuilder

src/gpu/gl/GrGLProgram.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLProgram_DEFINED
 #define GrGLProgram_DEFINED
@@ skipping 148 matching lines @@
                  const GrEffectStage* colorStages[],
                  const GrEffectStage* coverageStages[],
                  const GrDeviceCoordTexture* dstCopy, // can be NULL
                  SharedGLState*);
 
 private:
     typedef GrGLUniformManager::UniformHandle UniformHandle;
 
     GrGLProgram(GrGpuGL* gpu,
                 const GrGLProgramDesc& desc,
-                const GrEffectStage* colorStages[],
-                const GrEffectStage* coverageStages[]);
-
-    bool succeeded() const { return 0 != fProgramID; }
-
-    /**
-     * This is the heavy initialization routine for building a GLProgram. colorStages and
-     * coverageStages correspond to the output of GrGLProgramDesc::Build().
-     */
-    bool genProgram(GrGLShaderBuilder* builder,
-                    const GrEffectStage* colorStages[],
-                    const GrEffectStage* coverageStages[]);
+                GrGLUniformManager* uman,
+                const GrGLShaderBuilder::GenProgramOutput& builderOutput);
 
     // Sets the texture units for samplers
     void initSamplerUniforms();
 
     // Helper for setData(). Makes GL calls to specify the initial color when there is not
     // per-vertex colors.
     void setColor(const GrDrawState&, GrColor color, SharedGLState*);
 
     // Helper for setData(). Makes GL calls to specify the initial coverage when there is not
     // per-vertex coverages.
     void setCoverage(const GrDrawState&, GrColor coverage, SharedGLState*);
 
     // Helper for setData() that sets the view matrix and loads the render target height uniform
     void setMatrixAndRenderTargetHeight(const GrDrawState&);
 
     // GL program ID
-    GrGLuint                    fProgramID;
+    GrGLuint                            fProgramID;
 
     // these reflect the current values of uniforms (GL uniform values travel with program)
-    MatrixState                       fMatrixState;
-    GrColor                           fColor;
-    GrColor                           fCoverage;
-    int                               fDstCopyTexUnit;
+    MatrixState                         fMatrixState;
+    GrColor                             fColor;
+    GrColor                             fCoverage;
+    int                                 fDstCopyTexUnit;
 
-    SkAutoTDelete<GrGLProgramEffects> fColorEffects;
-    SkAutoTDelete<GrGLProgramEffects> fCoverageEffects;
+    SkAutoTDelete<GrGLProgramEffects>   fColorEffects;
+    SkAutoTDelete<GrGLProgramEffects>   fCoverageEffects;
+    
+    GrGLProgramDesc                     fDesc;
+    
+    GrGpuGL*                            fGpu;
 
-    GrGLProgramDesc                   fDesc;
-    GrGpuGL*                          fGpu;
+    SkAutoTUnref<GrGLUniformManager>    fUniformManager;
+    GrGLShaderBuilder::UniformHandles   fUniformHandles;
 
-    GrGLUniformManager                fUniformManager;
-    GrGLShaderBuilder::UniformHandles fUniformHandles;
-
-    bool                              fHasVertexShader;
-    int                               fNumTexCoordSets;
+    bool                                fHasVertexShader;
+    int                                 fNumTexCoordSets;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif