Make GrGLProgram no longer depend on kNumStages

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 138 matching lines @@
     // 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&);
 
-    typedef SkSTArray<4, UniformHandle, true> SamplerUniSArray;
-
+    // handles for uniforms (aside from per-effect samplers)
     struct UniformHandles {
         UniformHandle       fViewMatrixUni;
         UniformHandle       fColorUni;
         UniformHandle       fCoverageUni;
         UniformHandle       fColorFilterUni;
 
         // We use the render target height to provide a y-down frag coord when specifying
         // origin_upper_left is not supported.
         UniformHandle       fRTHeightUni;
 
         // Uniforms for computing texture coords to do the dst-copy lookup
         UniformHandle       fDstCopyTopLeftUni;
         UniformHandle       fDstCopyScaleUni;
         UniformHandle       fDstCopySamplerUni;
 
-        // An array of sampler uniform handles for each effect.
-        SamplerUniSArray    fEffectSamplerUnis[GrDrawState::kNumStages];
-
         UniformHandles() {
             fViewMatrixUni = GrGLUniformManager::kInvalidUniformHandle;
             fColorUni = GrGLUniformManager::kInvalidUniformHandle;
             fCoverageUni = GrGLUniformManager::kInvalidUniformHandle;
             fColorFilterUni = GrGLUniformManager::kInvalidUniformHandle;
             fRTHeightUni = GrGLUniformManager::kInvalidUniformHandle;
             fDstCopyTopLeftUni = GrGLUniformManager::kInvalidUniformHandle;
             fDstCopyScaleUni = GrGLUniformManager::kInvalidUniformHandle;
             fDstCopySamplerUni = GrGLUniformManager::kInvalidUniformHandle;
         }
     };
 
+    typedef SkSTArray<4, UniformHandle, true> SamplerUniSArray;
+    typedef SkSTArray<4, int, true> TextureUnitSArray;
+
+    struct EffectAndSamplers {
+        EffectAndSamplers() : fGLEffect(NULL) {}
+        ~EffectAndSamplers() { delete fGLEffect; }
+        GrGLEffect*         fGLEffect;
+        SamplerUniSArray    fSamplerUnis;  // sampler uni handles for effect's GrTextureAccess
+        TextureUnitSArray   fTextureUnits; // texture unit used for each entry of fSamplerUnis
+    };
+
     // GL IDs
     GrGLuint                    fVShaderID;
     GrGLuint                    fGShaderID;
     GrGLuint                    fFShaderID;
     GrGLuint                    fProgramID;
 
     // these reflect the current values of uniforms (GL uniform values travel with program)
     MatrixState                 fMatrixState;
     GrColor                     fColor;
     GrColor                     fCoverage;
     GrColor                     fColorFilterColor;
+    int                         fDstCopyTexUnit;
 
-    GrGLEffect*                 fEffects[GrDrawState::kNumStages];
+    SkTArray<EffectAndSamplers> fEffectStates;
 
     GrGLProgramDesc             fDesc;
     const GrGLContext&          fContext;
 
     GrGLUniformManager          fUniformManager;
     UniformHandles              fUniformHandles;
 
     typedef GrRefCnt INHERITED;
 };
 
 #endif