Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/effects/SkArithmeticMode.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkArithmeticMode.h"
 #include "SkColorPriv.h"
 #include "SkFlattenableBuffers.h"
@@ skipping 232 matching lines @@
 
     virtual void emitCode(GrGLShaderBuilder*,
                           const GrDrawEffect&,
                           EffectKey,
                           const char* outputColor,
                           const char* inputColor,
                           const TextureSamplerArray&) SK_OVERRIDE;
 
     static inline EffectKey GenKey(const GrDrawEffect&, const GrGLCaps&);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRIDE;
 
 private:
     static const GrEffect::CoordsType kCoordsType = GrEffect::kLocal_CoordsType;
     GrGLEffectMatrix fBackgroundEffectMatrix;
-    GrGLUniformManager::UniformHandle fKUni;
+    GrGLUniform* fKUni;
 
     typedef GrGLEffect INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class GrArithmeticEffect : public GrEffect {
 public:
     static GrEffectRef* Create(float k1, float k2, float k3, float k4, GrTexture* background) {
         AutoEffectUnref effect(SkNEW_ARGS(GrArithmeticEffect, (k1, k2, k3, k4, background)));
@@ skipping 89 matching lines @@
                                      samplers[0],
                                      bgCoords,
                                      bgCoordsType);
         builder->fsCodeAppendf(";\n");
         dstColor = "bgColor";
     } else {
         dstColor = builder->dstColor();
     }
 
     GrAssert(NULL != dstColor);
-    fKUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                kVec4f_GrSLType, "k");
-    const char* kUni = builder->getUniformCStr(fKUni);
+    GrGLShaderBuilder::Uniform* KUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kVec4f_GrSLType, "k");
+    fKUni = KUni->glUniform();
+
+    const char* kUni = KUni->c_str();
 
     // We don't try to optimize for this case at all
     if (NULL == inputColor) {
         builder->fsCodeAppendf("\t\tconst vec4 src = %s;\n", GrGLSLOnesVecf(4));
     } else {
         builder->fsCodeAppendf("\t\tvec4 src = %s;\n", inputColor);
         if (gUseUnpremul) {
             builder->fsCodeAppendf("\t\tsrc.rgb = clamp(src.rgb / src.a, 0.0, 1.0);\n");
         }
     }
 
     builder->fsCodeAppendf("\t\tvec4 dst = %s;\n", dstColor);
     if (gUseUnpremul) {
         builder->fsCodeAppendf("\t\tdst.rgb = clamp(dst.rgb / dst.a, 0.0, 1.0);\n");
     }
 
     builder->fsCodeAppendf("\t\t%s = %s.x * src * dst + %s.y * src + %s.z * dst + %s.w;\n", outputColor, kUni, kUni, kUni, kUni);
     builder->fsCodeAppendf("\t\t%s = clamp(%s, 0.0, 1.0);\n", outputColor, outputColor);
     if (gUseUnpremul) {
         builder->fsCodeAppendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
     } else {
         builder->fsCodeAppendf("\t\t%s.rgb = min(%s.rgb, %s.a);\n", outputColor, outputColor, outputColor);
     }
 }
 
-void GrGLArithmeticEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
+void GrGLArithmeticEffect::setData(const GrGLContext& context, const GrDrawEffect& drawEffect) {
     const GrArithmeticEffect& arith = drawEffect.castEffect<GrArithmeticEffect>();
-    uman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
+    fKUni->set4f(context, arith.k1(), arith.k2(), arith.k3(), arith.k4());
     GrTexture* bgTex = arith.backgroundTexture();
     if (bgTex) {
-        fBackgroundEffectMatrix.setData(uman,
+        fBackgroundEffectMatrix.setData(context,
                                         GrEffect::MakeDivByTextureWHMatrix(bgTex),
                                         drawEffect,
                                         bgTex);
     }
 }
 
 GrGLEffect::EffectKey GrGLArithmeticEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) {
     const GrArithmeticEffect& effect = drawEffect.castEffect<GrArithmeticEffect>();
     GrTexture* bgTex = effect.backgroundTexture();
     EffectKey bgKey = 0;
@@ skipping 34 matching lines @@
                                              background);
     }
     return true;
 }
 
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkArithmeticMode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkArithmeticMode_scalar)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END