Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

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
 
+#include "GrAllocator.h"
 #include "GrDrawState.h"
 #include "GrGLContext.h"
 #include "GrGLProgramDesc.h"
 #include "GrGLSL.h"
 #include "GrGLTexture.h"
-#include "GrGLUniformManager.h"
+#include "GrGLUniform.h"
 
 #include "SkString.h"
 #include "SkXfermode.h"
 
 class GrBinHashKeyBuilder;
 class GrGLEffect;
 class GrGLShaderBuilder;
 
 /**
  * This class manages a GPU program and records per-program information.
@@ skipping 79 matching lines @@
      * GrGpuGL object to bind the textures required by the GrGLEffects. The color and coverage
      * stages come from GrGLProgramDesc::Build().
      */
     void setData(GrGpuGL*,
                  GrDrawState::BlendOptFlags,
                  const GrEffectStage* colorStages[],
                  const GrEffectStage* coverageStages[],
                  const GrDeviceCoordTexture* dstCopy, // can be NULL
                  SharedGLState*);
 
+
+    /**
+     * Called by the GrGLShaderBuilder to create uniforms.
+     */
+    GrGLUniform* appendUniform() {
+        GrGLUniform& uni = fUniforms.push_back();
+        return &uni;
+    }
+
 private:
-    typedef GrGLUniformManager::UniformHandle UniformHandle;
-
     // handles for uniforms (aside from per-effect samplers)
-    struct UniformHandles {
-        UniformHandle       fViewMatrixUni;
-        UniformHandle       fColorUni;
-        UniformHandle       fCoverageUni;
-        UniformHandle       fColorFilterUni;
+    struct NamedUniforms {
+        GrGLUniform* fViewMatrixUni;
+        GrGLUniform* fColorUni;
+        GrGLUniform* fCoverageUni;
+        GrGLUniform* fColorFilterUni;
 
         // We use the render target height to provide a y-down frag coord when specifying
         // origin_upper_left is not supported.
-        UniformHandle       fRTHeightUni;
+        GrGLUniform* fRTHeightUni;
 
         // Uniforms for computing texture coords to do the dst-copy lookup
-        UniformHandle       fDstCopyTopLeftUni;
-        UniformHandle       fDstCopyScaleUni;
-        UniformHandle       fDstCopySamplerUni;
+        GrGLUniform* fDstCopyTopLeftUni;
+        GrGLUniform* fDstCopyScaleUni;
+        GrGLUniform* fDstCopySamplerUni;
 
-        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;
+        NamedUniforms()
+            : fViewMatrixUni(NULL)
+            , fColorUni(NULL)
+            , fCoverageUni(NULL)
+            , fColorFilterUni(NULL)
+            , fRTHeightUni(NULL)
+            , fDstCopyTopLeftUni(NULL)
+            , fDstCopyScaleUni(NULL)
+            , fDstCopySamplerUni(NULL) {
         }
     };
 
-    typedef SkSTArray<4, UniformHandle, true> SamplerUniSArray;
+    typedef SkSTArray<4, GrGLUniform*, 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
     };
 
@@ skipping 55 matching lines @@
     GrColor                     fCoverage;
     GrColor                     fColorFilterColor;
     int                         fDstCopyTexUnit;
 
     SkTArray<EffectAndSamplers> fColorEffects;
     SkTArray<EffectAndSamplers> fCoverageEffects;
 
     GrGLProgramDesc             fDesc;
     const GrGLContext&          fContext;
 
-    GrGLUniformManager          fUniformManager;
-    UniformHandles              fUniformHandles;
+    GrTAllocator<GrGLUniform>   fUniforms;
+    NamedUniforms               fNamedUniforms;
 
     typedef GrRefCnt INHERITED;
 };
 
 #endif