Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/effects/gradients/SkTwoPointConicalGradient.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTwoPointConicalGradient.h"
 
@@ skipping 316 matching lines @@
     buffer.writeScalar(fRadius1);
     buffer.writeScalar(fRadius2);
 }
 
 /////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
 
 #include "GrTBackendEffectFactory.h"
 
-// For brevity
-typedef GrGLUniformManager::UniformHandle UniformHandle;
-static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidUniformHandle;
-
 class GrGLConical2Gradient : public GrGLGradientEffect {
 public:
 
     GrGLConical2Gradient(const GrBackendEffectFactory& factory, const GrDrawEffect&);
     virtual ~GrGLConical2Gradient() { }
 
     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;
 
     static EffectKey GenKey(const GrDrawEffect&, const GrGLCaps& caps);
 
 protected:
 
-    UniformHandle           fVSParamUni;
-    UniformHandle           fFSParamUni;
+    GrGLUniform* fVSParamUni;
+    GrGLUniform* fFSParamUni;
 
     const char* fVSVaryingName;
     const char* fFSVaryingName;
 
     bool fIsDegenerate;
 
     // @{
     /// Values last uploaded as uniforms
 
     SkScalar fCachedCenter;
@@ skipping 97 matching lines @@
     SkPaint paint;
     return shader->asNewEffect(context, paint);
 }
 
 
 /////////////////////////////////////////////////////////////////////
 
 GrGLConical2Gradient::GrGLConical2Gradient(const GrBackendEffectFactory& factory,
                                            const GrDrawEffect& drawEffect)
     : INHERITED(factory)
-    , fVSParamUni(kInvalidUniformHandle)
-    , fFSParamUni(kInvalidUniformHandle)
+    , fVSParamUni(NULL)
+    , fFSParamUni(NULL)
     , fVSVaryingName(NULL)
     , fFSVaryingName(NULL)
     , fCachedCenter(SK_ScalarMax)
     , fCachedRadius(-SK_ScalarMax)
     , fCachedDiffRadius(-SK_ScalarMax) {
 
     const GrConical2Gradient& data = drawEffect.castEffect<GrConical2Gradient>();
     fIsDegenerate = data.isDegenerate();
 }
 
 void GrGLConical2Gradient::emitCode(GrGLShaderBuilder* builder,
                                     const GrDrawEffect&,
                                     EffectKey key,
                                     const char* outputColor,
                                     const char* inputColor,
                                     const TextureSamplerArray& samplers) {
     const char* fsCoords;
     const char* vsCoordsVarying;
     GrSLType coordsVaryingType;
     this->setupMatrix(builder, key, &fsCoords, &vsCoordsVarying, &coordsVaryingType);
 
-    this->emitYCoordUniform(builder);
+    GrGLShaderBuilder::Uniform* yCoordUni = this->emitYCoordUniform(builder);
+
     // 2 copies of uniform array, 1 for each of vertex & fragment shader,
     // to work around Xoom bug. Doesn't seem to cause performance decrease
     // in test apps, but need to keep an eye on it.
-    fVSParamUni = builder->addUniformArray(GrGLShaderBuilder::kVertex_ShaderType,
-                                           kFloat_GrSLType, "Conical2VSParams", 6);
-    fFSParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_ShaderType,
-                                           kFloat_GrSLType, "Conical2FSParams", 6);
+    GrGLShaderBuilder::Uniform* vsParamUni =
+        builder->addUniformArray(GrGLShaderBuilder::kVertex_ShaderType,
+                                 kFloat_GrSLType, "Conical2VSParams", 6);
+    fVSParamUni = vsParamUni->glUniform();
+
+    GrGLShaderBuilder::Uniform* fsParamUni =
+        builder->addUniformArray(GrGLShaderBuilder::kFragment_ShaderType,
+                                 kFloat_GrSLType, "Conical2FSParams", 6);
+    fFSParamUni = fsParamUni->glUniform();
 
     // For radial gradients without perspective we can pass the linear
     // part of the quadratic as a varying.
     if (kVec2f_GrSLType == coordsVaryingType) {
         builder->addVarying(kFloat_GrSLType, "Conical2BCoeff",
                             &fVSVaryingName, &fFSVaryingName);
     }
 
     // VS
     {
         SkString p2; // distance between centers
         SkString p3; // start radius
         SkString p5; // difference in radii (r1 - r0)
-        builder->getUniformVariable(fVSParamUni).appendArrayAccess(2, &p2);
-        builder->getUniformVariable(fVSParamUni).appendArrayAccess(3, &p3);
-        builder->getUniformVariable(fVSParamUni).appendArrayAccess(5, &p5);
+        vsParamUni->appendArrayAccess(2, &p2);
+        vsParamUni->appendArrayAccess(3, &p3);
+        vsParamUni->appendArrayAccess(5, &p5);
 
         // For radial gradients without perspective we can pass the linear
         // part of the quadratic as a varying.
         if (kVec2f_GrSLType == coordsVaryingType) {
             // r2Var = -2 * (r2Parm[2] * varCoord.x - r2Param[3] * r2Param[5])
             builder->vsCodeAppendf("\t%s = -2.0 * (%s * %s.x + %s * %s);\n",
                                    fVSVaryingName, p2.c_str(),
                                    vsCoordsVarying, p3.c_str(), p5.c_str());
         }
     }
 
     // FS
     {
 
         SkString cName("c");
         SkString ac4Name("ac4");
         SkString dName("d");
         SkString qName("q");
         SkString r0Name("r0");
         SkString r1Name("r1");
         SkString tName("t");
         SkString p0; // 4a
         SkString p1; // 1/a
         SkString p2; // distance between centers
         SkString p3; // start radius
         SkString p4; // start radius squared
         SkString p5; // difference in radii (r1 - r0)
 
-        builder->getUniformVariable(fFSParamUni).appendArrayAccess(0, &p0);
-        builder->getUniformVariable(fFSParamUni).appendArrayAccess(1, &p1);
-        builder->getUniformVariable(fFSParamUni).appendArrayAccess(2, &p2);
-        builder->getUniformVariable(fFSParamUni).appendArrayAccess(3, &p3);
-        builder->getUniformVariable(fFSParamUni).appendArrayAccess(4, &p4);
-        builder->getUniformVariable(fFSParamUni).appendArrayAccess(5, &p5);
+        fsParamUni->appendArrayAccess(0, &p0);
+        fsParamUni->appendArrayAccess(1, &p1);
+        fsParamUni->appendArrayAccess(2, &p2);
+        fsParamUni->appendArrayAccess(3, &p3);
+        fsParamUni->appendArrayAccess(4, &p4);
+        fsParamUni->appendArrayAccess(5, &p5);
 
         // If we we're able to interpolate the linear component,
         // bVar is the varying; otherwise compute it
         SkString bVar;
         if (kVec2f_GrSLType == coordsVaryingType) {
             bVar = fFSVaryingName;
         } else {
             bVar = "b";
             builder->fsCodeAppendf("\tfloat %s = -2.0 * (%s * %s.x + %s * %s);\n",
                                    bVar.c_str(), p2.c_str(), fsCoords,
@@ skipping 42 matching lines @@
 
             // so we'll look at the larger one first:
             builder->fsCodeAppendf("\t\tfloat %s = max(%s, %s);\n", tName.c_str(),
                                    r0Name.c_str(), r1Name.c_str());
 
             // if r(t) > 0, then we're done; t will be our x coordinate
             builder->fsCodeAppendf("\t\tif (%s * %s + %s > 0.0) {\n", tName.c_str(),
                                    p5.c_str(), p3.c_str());
 
             builder->fsCodeAppend("\t\t");
-            this->emitColorLookup(builder, tName.c_str(), outputColor, inputColor, samplers[0]);
+            this->emitColorLookup(builder, yCoordUni, tName.c_str(), outputColor, inputColor, samplers[0]);
 
             // otherwise, if r(t) for the larger root was <= 0, try the other root
             builder->fsCodeAppend("\t\t} else {\n");
             builder->fsCodeAppendf("\t\t\t%s = min(%s, %s);\n", tName.c_str(),
                                    r0Name.c_str(), r1Name.c_str());
 
             // if r(t) > 0 for the smaller root, then t will be our x coordinate
             builder->fsCodeAppendf("\t\t\tif (%s * %s + %s > 0.0) {\n",
                                    tName.c_str(), p5.c_str(), p3.c_str());
 
             builder->fsCodeAppend("\t\t\t");
-            this->emitColorLookup(builder, tName.c_str(), outputColor, inputColor, samplers[0]);
+            this->emitColorLookup(builder, yCoordUni, tName.c_str(), outputColor, inputColor, samplers[0]);
 
             // end if (r(t) > 0) for smaller root
             builder->fsCodeAppend("\t\t\t}\n");
             // end if (r(t) > 0), else, for larger root
             builder->fsCodeAppend("\t\t}\n");
             // end if (discriminant >= 0)
             builder->fsCodeAppend("\t}\n");
         } else {
 
             // linear case: t = -c/b
             builder->fsCodeAppendf("\tfloat %s = -(%s / %s);\n", tName.c_str(),
                                    cName.c_str(), bVar.c_str());
 
             // if r(t) > 0, then t will be the x coordinate
             builder->fsCodeAppendf("\tif (%s * %s + %s > 0.0) {\n", tName.c_str(),
                                    p5.c_str(), p3.c_str());
             builder->fsCodeAppend("\t");
-            this->emitColorLookup(builder, tName.c_str(), outputColor, inputColor, samplers[0]);
+            this->emitColorLookup(builder, yCoordUni, tName.c_str(), outputColor, inputColor, samplers[0]);
             builder->fsCodeAppend("\t}\n");
         }
     }
 }
 
-void GrGLConical2Gradient::setData(const GrGLUniformManager& uman,
+void GrGLConical2Gradient::setData(const GrGLContext& context,
                                    const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
+    INHERITED::setData(context, drawEffect);
     const GrConical2Gradient& data = drawEffect.castEffect<GrConical2Gradient>();
     GrAssert(data.isDegenerate() == fIsDegenerate);
     SkScalar centerX1 = data.center();
     SkScalar radius0 = data.radius();
     SkScalar diffRadius = data.diffRadius();
 
     if (fCachedCenter != centerX1 ||
         fCachedRadius != radius0 ||
         fCachedDiffRadius != diffRadius) {
 
         SkScalar a = SkScalarMul(centerX1, centerX1) - diffRadius * diffRadius;
 
         // When we're in the degenerate (linear) case, the second
         // value will be INF but the program doesn't read it. (We
         // use the same 6 uniforms even though we don't need them
         // all in the linear case just to keep the code complexity
         // down).
         float values[6] = {
             SkScalarToFloat(a * 4),
             1.f / (SkScalarToFloat(a)),
             SkScalarToFloat(centerX1),
             SkScalarToFloat(radius0),
             SkScalarToFloat(SkScalarMul(radius0, radius0)),
             SkScalarToFloat(diffRadius)
         };
 
-        uman.set1fv(fVSParamUni, 0, 6, values);
-        uman.set1fv(fFSParamUni, 0, 6, values);
+        fVSParamUni->set1fv(context, 0, 6, values);
+        fFSParamUni->set1fv(context, 0, 6, values);
         fCachedCenter = centerX1;
         fCachedRadius = radius0;
         fCachedDiffRadius = diffRadius;
     }
 }
 
 GrGLEffect::EffectKey GrGLConical2Gradient::GenKey(const GrDrawEffect& drawEffect,
                                                    const GrGLCaps&) {
     enum {
         kIsDegenerate = 1 << kMatrixKeyBitCnt,
@@ skipping 58 matching lines @@
     str->appendScalar(fCenter2.fY);
     str->append(") radius2: ");
     str->appendScalar(fRadius2);
     str->append(" ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif