Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/effects/SkPerlinNoiseShader.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 "SkDither.h"
 #include "SkPerlinNoiseShader.h"
 #include "SkFlattenableBuffers.h"
@@ skipping 488 matching lines @@
 #include "GrTBackendEffectFactory.h"
 
 class GrGLNoise : public GrGLEffect {
 public:
     GrGLNoise(const GrBackendEffectFactory& factory,
               const GrDrawEffect& drawEffect);
     virtual ~GrGLNoise() {}
 
     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;
 
 protected:
     SkPerlinNoiseShader::Type           fType;
     bool                                fStitchTiles;
     int                                 fNumOctaves;
-    GrGLUniformManager::UniformHandle   fBaseFrequencyUni;
-    GrGLUniformManager::UniformHandle   fAlphaUni;
-    GrGLUniformManager::UniformHandle   fInvMatrixUni;
+    GrGLUniform*        fBaseFrequencyUni;
+    GrGLUniform*        fAlphaUni;
+    GrGLUniform*        fInvMatrixUni;
     GrGLEffectMatrix                    fEffectMatrix;
 
 private:
     typedef GrGLEffect INHERITED;
 };
 
 class GrGLPerlinNoise : public GrGLNoise {
 public:
     GrGLPerlinNoise(const GrBackendEffectFactory& factory,
                     const GrDrawEffect& drawEffect)
       : GrGLNoise(factory, drawEffect) {}
     virtual ~GrGLPerlinNoise() {}
 
     virtual void emitCode(GrGLShaderBuilder*,
                           const GrDrawEffect&,
                           EffectKey,
                           const char* outputColor,
                           const char* inputColor,
                           const TextureSamplerArray&) SK_OVERRIDE;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRIDE;
 
 private:
-    GrGLUniformManager::UniformHandle fStitchDataUni;
+    GrGLUniform* fStitchDataUni;
 
     typedef GrGLNoise INHERITED;
 };
 
 class GrGLSimplexNoise : public GrGLNoise {
     // Note : This is for reference only. GrGLPerlinNoise is used for processing.
 public:
     GrGLSimplexNoise(const GrBackendEffectFactory& factory,
                      const GrDrawEffect& drawEffect)
       : GrGLNoise(factory, drawEffect) {}
 
     virtual ~GrGLSimplexNoise() {}
 
     virtual void emitCode(GrGLShaderBuilder*,
                           const GrDrawEffect&,
                           EffectKey,
                           const char* outputColor,
                           const char* inputColor,
                           const TextureSamplerArray&) SK_OVERRIDE;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void setData(const GrGLContext&, const GrDrawEffect&) SK_OVERRIDE;
 
 private:
-    GrGLUniformManager::UniformHandle fSeedUni;
+    GrGLUniform* fSeedUni;
 
     typedef GrGLNoise INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
 
 class GrNoiseEffect : public GrEffect {
 public:
     virtual ~GrNoiseEffect() { }
 
@@ skipping 169 matching lines @@
                                 const GrDrawEffect&,
                                 EffectKey key,
                                 const char* outputColor,
                                 const char* inputColor,
                                 const TextureSamplerArray&) {
     sk_ignore_unused_variable(inputColor);
 
     const char* vCoords;
     fEffectMatrix.emitCodeMakeFSCoords2D(builder, key, &vCoords);
 
-    fSeedUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                   kFloat_GrSLType, "seed");
-    const char* seedUni = builder->getUniformCStr(fSeedUni);
-    fInvMatrixUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                        kMat33f_GrSLType, "invMatrix");
-    const char* invMatrixUni = builder->getUniformCStr(fInvMatrixUni);
-    fBaseFrequencyUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                            kVec2f_GrSLType, "baseFrequency");
-    const char* baseFrequencyUni = builder->getUniformCStr(fBaseFrequencyUni);
-    fAlphaUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                    kFloat_GrSLType, "alpha");
-    const char* alphaUni = builder->getUniformCStr(fAlphaUni);
+    GrGLShaderBuilder::Uniform* seedUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType, "seed");
+    fSeedUni = seedUni->glUniform();
+
+    GrGLShaderBuilder::Uniform* invMatrixUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kMat33f_GrSLType, "invMatrix");
+    fInvMatrixUni = invMatrixUni->glUniform();
+
+    GrGLShaderBuilder::Uniform* baseFrequencyUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kVec2f_GrSLType, "baseFrequency");
+    fBaseFrequencyUni = baseFrequencyUni->glUniform();
+
+    GrGLShaderBuilder::Uniform* alphaUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType, "alpha");
+    fAlphaUni = alphaUni->glUniform();
 
     // Add vec3 modulo 289 function
     static const GrGLShaderVar gVec3Args[] =  {
         GrGLShaderVar("x", kVec3f_GrSLType)
     };
 
     SkString mod289_3_funcName;
     builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType, kVec3f_GrSLType,
                           "mod289", SK_ARRAY_COUNT(gVec3Args), gVec3Args,
                           "const vec2 C = vec2(1.0 / 289.0, 289.0);\n"
@@ skipping 120 matching lines @@
     const char* yOffsets    = "yOffsets";
     const char* channel     = "channel";
 
     // Fill with some prime numbers
     builder->fsCodeAppendf("\t\tconst vec4 %s = vec4(13.0, 53.0, 101.0, 151.0);\n", xOffsets);
     builder->fsCodeAppendf("\t\tconst vec4 %s = vec4(109.0, 167.0, 23.0, 67.0);\n", yOffsets);
 
     // There are rounding errors if the floor operation is not performed here
     builder->fsCodeAppendf(
         "\t\tvec3 %s = vec3(floor((%s*vec3(%s, 1.0)).xy) * vec2(0.66) * %s, 0.0);\n",
-        noiseVecIni, invMatrixUni, vCoords, baseFrequencyUni);
+        noiseVecIni, invMatrixUni->c_str(), vCoords, baseFrequencyUni->c_str());
 
     // Perturb the texcoords with three components of noise
     builder->fsCodeAppendf("\t\t%s += 0.1 * vec3(%s(%s + vec3(  0.0,   0.0, %s)),"
                                                 "%s(%s + vec3( 43.0,  17.0, %s)),"
                                                 "%s(%s + vec3(-17.0, -43.0, %s)));\n",
-                           noiseVecIni, noiseFuncName.c_str(), noiseVecIni, seedUni,
-                                        noiseFuncName.c_str(), noiseVecIni, seedUni,
-                                        noiseFuncName.c_str(), noiseVecIni, seedUni);
+                           noiseVecIni, noiseFuncName.c_str(), noiseVecIni, seedUni->c_str(),
+                                        noiseFuncName.c_str(), noiseVecIni, seedUni->c_str(),
+                                        noiseFuncName.c_str(), noiseVecIni, seedUni->c_str());
 
     builder->fsCodeAppendf("\t\t%s = vec4(0.0);\n", outputColor);
 
     builder->fsCodeAppendf("\t\tvec3 %s = vec3(1.0);\n", factors);
     builder->fsCodeAppendf("\t\tfloat %s = 0.0;\n", sum);
 
     // Loop over all octaves
     builder->fsCodeAppendf("\t\tfor (int octave = 0; octave < %d; ++octave) {\n", fNumOctaves);
 
     // Loop over the 4 channels
     builder->fsCodeAppendf("\t\t\tfor (int %s = 3; %s >= 0; --%s) {\n", channel, channel, channel);
 
     builder->fsCodeAppendf(
         "\t\t\t\t%s[channel] += %s.x * %s(%s * %s.yyy - vec3(%s[%s], %s[%s], %s * %s.z));\n",
         outputColor, factors, noiseFuncName.c_str(), noiseVecIni, factors, xOffsets, channel,
-        yOffsets, channel, seedUni, factors);
+        yOffsets, channel, seedUni->c_str(), factors);
 
     builder->fsCodeAppend("\t\t\t}\n"); // end of the for loop on channels
 
     builder->fsCodeAppendf("\t\t\t%s += %s.x;\n", sum, factors);
     builder->fsCodeAppendf("\t\t\t%s *= vec3(0.5, 2.0, 0.75);\n", factors);
 
     builder->fsCodeAppend("\t\t}\n"); // end of the for loop on octaves
 
     if (fType == SkPerlinNoiseShader::kFractalNoise_Type) {
         // The value of turbulenceFunctionResult comes from ((turbulenceFunctionResult) + 1) / 2
         // by fractalNoise and (turbulenceFunctionResult) by turbulence.
         builder->fsCodeAppendf("\t\t%s = %s * vec4(0.5 / %s) + vec4(0.5);\n",
                                outputColor, outputColor, sum);
     } else {
         builder->fsCodeAppendf("\t\t%s = abs(%s / vec4(%s));\n",
                                outputColor, outputColor, sum);
     }
 
-    builder->fsCodeAppendf("\t\t%s.a *= %s;\n", outputColor, alphaUni);
+    builder->fsCodeAppendf("\t\t%s.a *= %s;\n", outputColor, alphaUni->c_str());
 
     // Clamp values
     builder->fsCodeAppendf("\t\t%s = clamp(%s, 0.0, 1.0);\n", outputColor, outputColor);
 
     // Pre-multiply the result
     builder->fsCodeAppendf("\t\t%s = vec4(%s.rgb * %s.aaa, %s.a);\n",
                            outputColor, outputColor, outputColor, outputColor);
 }
 
 void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
                                const GrDrawEffect&,
                                EffectKey key,
                                const char* outputColor,
                                const char* inputColor,
                                const TextureSamplerArray& samplers) {
     sk_ignore_unused_variable(inputColor);
 
     const char* vCoords;
     fEffectMatrix.emitCodeMakeFSCoords2D(builder, key, &vCoords);
 
-    fInvMatrixUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                        kMat33f_GrSLType, "invMatrix");
-    const char* invMatrixUni = builder->getUniformCStr(fInvMatrixUni);
-    fBaseFrequencyUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                            kVec2f_GrSLType, "baseFrequency");
-    const char* baseFrequencyUni = builder->getUniformCStr(fBaseFrequencyUni);
-    fAlphaUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                    kFloat_GrSLType, "alpha");
-    const char* alphaUni = builder->getUniformCStr(fAlphaUni);
+    GrGLShaderBuilder::Uniform* invMatrixUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kMat33f_GrSLType, "invMatrix");
+    fInvMatrixUni = invMatrixUni->glUniform();
 
-    const char* stitchDataUni = NULL;
+    GrGLShaderBuilder::Uniform* baseFrequencyUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kVec2f_GrSLType,
+                            "baseFrequency");
+    fBaseFrequencyUni = baseFrequencyUni->glUniform();
+
+    GrGLShaderBuilder::Uniform* alphaUni =
+        builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType, "alpha");
+    fAlphaUni = alphaUni->glUniform();
+
+    GrGLShaderBuilder::Uniform* stitchDataUni = NULL;
     if (fStitchTiles) {
-        fStitchDataUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
-                                             kVec2f_GrSLType, "stitchData");
-        stitchDataUni = builder->getUniformCStr(fStitchDataUni);
+        stitchDataUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
+                                            kVec2f_GrSLType, "stitchData");
+        fStitchDataUni = stitchDataUni->glUniform();
     }
 
     // There are 4 lines, so the center of each line is 1/8, 3/8, 5/8 and 7/8
     const char* chanCoordR  = "0.125";
     const char* chanCoordG  = "0.375";
     const char* chanCoordB  = "0.625";
     const char* chanCoordA  = "0.875";
     const char* chanCoord   = "chanCoord";
     const char* stitchData  = "stitchData";
     const char* ratio       = "ratio";
@@ skipping 145 matching lines @@
                               "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseStitchArgs),
                               gPerlinNoiseStitchArgs, noiseCode.c_str(), &noiseFuncName);
     } else {
         builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType, kFloat_GrSLType,
                               "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseArgs),
                               gPerlinNoiseArgs, noiseCode.c_str(), &noiseFuncName);
     }
 
     // There are rounding errors if the floor operation is not performed here
     builder->fsCodeAppendf("\n\t\tvec2 %s = floor((%s * vec3(%s, 1.0)).xy) * %s;",
-                           noiseVec, invMatrixUni, vCoords, baseFrequencyUni);
+                           noiseVec, invMatrixUni->c_str(), vCoords, baseFrequencyUni->c_str());
 
     // Clear the color accumulator
     builder->fsCodeAppendf("\n\t\t%s = vec4(0.0);", outputColor);
 
     if (fStitchTiles) {
         // Set up TurbulenceInitial stitch values.
-        builder->fsCodeAppendf("\n\t\tvec2 %s = %s;", stitchData, stitchDataUni);
+        builder->fsCodeAppendf("\n\t\tvec2 %s = %s;", stitchData, stitchDataUni->c_str());
     }
 
     builder->fsCodeAppendf("\n\t\tfloat %s = 1.0;", ratio);
 
     // Loop over all octaves
     builder->fsCodeAppendf("\n\t\tfor (int octave = 0; octave < %d; ++octave) {", fNumOctaves);
 
     builder->fsCodeAppendf("\n\t\t\t%s += ", outputColor);
     if (fType != SkPerlinNoiseShader::kFractalNoise_Type) {
         builder->fsCodeAppend("abs(");
@@ skipping 27 matching lines @@
         builder->fsCodeAppendf("\n\t\t\t%s *= vec2(2.0);", stitchData);
     }
     builder->fsCodeAppend("\n\t\t}"); // end of the for loop on octaves
 
     if (fType == SkPerlinNoiseShader::kFractalNoise_Type) {
         // The value of turbulenceFunctionResult comes from ((turbulenceFunctionResult) + 1) / 2
         // by fractalNoise and (turbulenceFunctionResult) by turbulence.
         builder->fsCodeAppendf("\n\t\t%s = %s * vec4(0.5) + vec4(0.5);", outputColor, outputColor);
     }
 
-    builder->fsCodeAppendf("\n\t\t%s.a *= %s;", outputColor, alphaUni);
+    builder->fsCodeAppendf("\n\t\t%s.a *= %s;", outputColor, alphaUni->c_str());
 
     // Clamp values
     builder->fsCodeAppendf("\n\t\t%s = clamp(%s, 0.0, 1.0);", outputColor, outputColor);
 
     // Pre-multiply the result
     builder->fsCodeAppendf("\n\t\t%s = vec4(%s.rgb * %s.aaa, %s.a);\n",
                   outputColor, outputColor, outputColor, outputColor);
 }
 
 GrGLNoise::GrGLNoise(const GrBackendEffectFactory& factory, const GrDrawEffect& drawEffect)
@@ skipping 28 matching lines @@
     }
 
     key = key << GrGLEffectMatrix::kKeyBits;
 
     SkMatrix m = turbulence.matrix();
     m.postTranslate(SK_Scalar1, SK_Scalar1);
     return key | GrGLEffectMatrix::GenKey(m, drawEffect,
                  drawEffect.castEffect<GrPerlinNoiseEffect>().coordsType(), NULL);
 }
 
-void GrGLNoise::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
+void GrGLNoise::setData(const GrGLContext& context, const GrDrawEffect& drawEffect) {
     const GrPerlinNoiseEffect& turbulence = drawEffect.castEffect<GrPerlinNoiseEffect>();
 
     const SkVector& baseFrequency = turbulence.baseFrequency();
-    uman.set2f(fBaseFrequencyUni, baseFrequency.fX, baseFrequency.fY);
-    uman.set1f(fAlphaUni, SkScalarDiv(SkIntToScalar(turbulence.alpha()), SkIntToScalar(255)));
+    fBaseFrequencyUni->set2f(context, baseFrequency.fX, baseFrequency.fY);
+    fAlphaUni->set1f(context, SkScalarDiv(SkIntToScalar(turbulence.alpha()), SkIntToScalar(255)));
 
     SkMatrix m = turbulence.matrix();
     SkMatrix invM;
     if (!m.invert(&invM)) {
         invM.reset();
     } else {
         invM.postConcat(invM); // Square the matrix
     }
-    uman.setSkMatrix(fInvMatrixUni, invM);
+    fInvMatrixUni->setSkMatrix(context, invM);
 
     // This (1,1) translation is due to WebKit's 1 based coordinates for the noise
     // (as opposed to 0 based, usually). The same adjustment is in the shadeSpan() functions.
     m.postTranslate(SK_Scalar1, SK_Scalar1);
-    fEffectMatrix.setData(uman, m, drawEffect, NULL);
+    fEffectMatrix.setData(context, m, drawEffect, NULL);
 }
 
-void GrGLPerlinNoise::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
+void GrGLPerlinNoise::setData(const GrGLContext& context, const GrDrawEffect& drawEffect) {
+    INHERITED::setData(context, drawEffect);
 
     const GrPerlinNoiseEffect& turbulence = drawEffect.castEffect<GrPerlinNoiseEffect>();
     if (turbulence.stitchTiles()) {
         const SkPerlinNoiseShader::StitchData& stitchData = turbulence.stitchData();
-        uman.set2f(fStitchDataUni, SkIntToScalar(stitchData.fWidth),
+        fStitchDataUni->set2f(context, SkIntToScalar(stitchData.fWidth),
                                    SkIntToScalar(stitchData.fHeight));
     }
 }
 
-void GrGLSimplexNoise::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
+void GrGLSimplexNoise::setData(const GrGLContext& context, const GrDrawEffect& drawEffect) {
+    INHERITED::setData(context, drawEffect);
 
     const GrSimplexNoiseEffect& turbulence = drawEffect.castEffect<GrSimplexNoiseEffect>();
-    uman.set1f(fSeedUni, turbulence.seed());
+    fSeedUni->set1f(context, turbulence.seed());
 }
 
 /////////////////////////////////////////////////////////////////////
 
 GrEffectRef* SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint& paint) const {
     SkASSERT(NULL != context);
 
     // Either we don't stitch tiles, either we have a valid tile size
     SkASSERT(!fStitchTiles || !fTileSize.isEmpty());
 
@@ skipping 66 matching lines @@
     str->append(" seed: ");
     str->appendScalar(fSeed);
     str->append(" stitch tiles: ");
     str->append(fStitchTiles ? "true " : "false ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif