Use GrGLShaderBuilder::GenProgramOutput in GrGLProgram.

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 42 matching lines @@
     /**
      * The shader may modify the blend coefficients. Params are in/out.
      */
     void overrideBlend(GrBlendCoeff* srcCoeff, GrBlendCoeff* dstCoeff) const;
 
     const GrGLProgramDesc& getDesc() { return fDesc; }
 
     /**
      * Gets the GL program ID for this program.
      */
-    GrGLuint programID() const { return fProgramID; }
+    GrGLuint programID() const { return fBuilderOutput.fProgramID; }
 
-    bool hasVertexShader() const { return fHasVertexShader; }
+    bool hasVertexShader() const { return fBuilderOutput.fHasVertexShader; }
 
     /**
      * Some GL state that is relevant to programs is not stored per-program. In particular color
      * and coverage attributes can be global state. This struct is read and updated by
      * GrGLProgram::setColor and GrGLProgram::setCoverage to allow us to avoid setting this state
      * redundantly.
      */
     struct SharedGLState {
         GrColor fConstAttribColor;
         int     fConstAttribColorIndex;
@@ skipping 81 matching lines @@
      */
     void setData(GrDrawState::BlendOptFlags,
                  const GrEffectStage* colorStages[],
                  const GrEffectStage* coverageStages[],
                  const GrDeviceCoordTexture* dstCopy, // can be NULL
                  SharedGLState*);
 
 private:
     typedef GrGLUniformManager::UniformHandle UniformHandle;
 
-    GrGLProgram(GrGpuGL* gpu,
-                const GrGLProgramDesc& desc,
-                GrGLUniformManager* uman,
-                const GrGLShaderBuilder::GenProgramOutput& builderOutput);
+    GrGLProgram(GrGpuGL*,
+                const GrGLProgramDesc&,
+                GrGLUniformManager*,
+                const GrGLShaderBuilder::GenProgramOutput&);
 
-    // Sets the texture units for samplers
+    // 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;
-
     // these reflect the current values of uniforms (GL uniform values travel with program)
     MatrixState                         fMatrixState;
     GrColor                             fColor;
     GrColor                             fCoverage;
     int                                 fDstCopyTexUnit;
 
-    SkAutoTDelete<GrGLProgramEffects>   fColorEffects;
-    SkAutoTDelete<GrGLProgramEffects>   fCoverageEffects;
+    GrGLShaderBuilder::GenProgramOutput fBuilderOutput;
 
     GrGLProgramDesc                     fDesc;
-
     GrGpuGL*                            fGpu;
 
     SkAutoTUnref<GrGLUniformManager>    fUniformManager;
-    GrGLShaderBuilder::UniformHandles   fUniformHandles;
-
-    bool                                fHasVertexShader;
-    int                                 fTexCoordSetCnt;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif