Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/effects/gradients/SkGradientShader.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGradientShaderPriv.h"
 #include "SkLinearGradient.h"
 #include "SkRadialGradient.h"
@@ skipping 808 matching lines @@
 
 #if SK_SUPPORT_GPU
 
 #include "effects/GrTextureStripAtlas.h"
 #include "GrTBackendEffectFactory.h"
 #include "SkGr.h"
 
 GrGLGradientEffect::GrGLGradientEffect(const GrBackendEffectFactory& factory)
     : INHERITED(factory)
     , fCachedYCoord(SK_ScalarMax)
-    , fFSYUni(GrGLUniformManager::kInvalidUniformHandle)
+    , fFSYUni(NULL)
     , fEffectMatrix(kCoordsType) {
 }
 
 GrGLGradientEffect::~GrGLGradientEffect() { }
 
-void GrGLGradientEffect::emitYCoordUniform(GrGLShaderBuilder* builder) {
-    fFSYUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                  kFloat_GrSLType, "GradientYCoordFS");
+GrGLShaderBuilder::Uniform* GrGLGradientEffect::emitYCoordUniform(GrGLShaderBuilder* builder) {
+    GrGLShaderBuilder::Uniform* fsYUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
+                            kFloat_GrSLType, "GradientYCoordFS");
+    fFSYUni = fsYUni->glUniform();
+    return fsYUni;
 }
 
-void GrGLGradientEffect::setData(const GrGLUniformManager& uman,
+void GrGLGradientEffect::setData(const GrGLContext& context,
                                  const GrDrawEffect& drawEffect) {
     const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
     const GrTexture* texture = e.texture(0);
-    fEffectMatrix.setData(uman, e.getMatrix(), drawEffect, texture);
+    fEffectMatrix.setData(context, e.getMatrix(), drawEffect, texture);
 
     SkScalar yCoord = e.getYCoord();
     if (yCoord != fCachedYCoord) {
-        uman.set1f(fFSYUni, yCoord);
+        fFSYUni->set1f(context, yCoord);
         fCachedYCoord = yCoord;
     }
 }
 
 GrGLEffect::EffectKey GrGLGradientEffect::GenMatrixKey(const GrDrawEffect& drawEffect) {
     const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
     const GrTexture* texture = e.texture(0);
     return GrGLEffectMatrix::GenKey(e.getMatrix(), drawEffect, kCoordsType, texture);
 }
 
 void GrGLGradientEffect::setupMatrix(GrGLShaderBuilder* builder,
                                      EffectKey key,
                                      const char** fsCoordName,
                                      const char** vsVaryingName,
                                      GrSLType* vsVaryingType) {
     fEffectMatrix.emitCodeMakeFSCoords2D(builder,
                                          key & kMatrixKeyMask,
                                          fsCoordName,
                                          vsVaryingName,
                                          vsVaryingType);
 }
 
 void GrGLGradientEffect::emitColorLookup(GrGLShaderBuilder* builder,
+                                         GrGLShaderBuilder::Uniform* fsYUni,
                                          const char* gradientTValue,
                                          const char* outputColor,
                                          const char* inputColor,
                                          const GrGLShaderBuilder::TextureSampler& sampler) {
 
     builder->fsCodeAppendf("\tvec2 coord = vec2(%s, %s);\n",
                            gradientTValue,
-                           builder->getUniformVariable(fFSYUni).c_str());
+                           fsYUni->c_str());
     builder->fsCodeAppendf("\t%s = ", outputColor);
     builder->appendTextureLookupAndModulate(GrGLShaderBuilder::kFragment_ShaderType,
                                             inputColor,
                                             sampler,
                                             "coord");
     builder->fsCodeAppend(";\n");
 }
 
 /////////////////////////////////////////////////////////////////////
 
@@ skipping 87 matching lines @@
             (*stops)[i] = stop;
             stop = i < outColors - 1 ? stop + random->nextUScalar1() * (1.f - stop) : 1.f;
         }
     }
     *tm = static_cast<SkShader::TileMode>(random->nextULessThan(SkShader::kTileModeCount));
 
     return outColors;
 }
 
 #endif