Small change to use a GrGeometryProcessor for all BitmapText draw calls

src/gpu/effects/GrBitmapTextGeoProc.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 "GrBitmapTextGeoProc.h"
 #include "GrInvariantOutput.h"
 #include "GrTexture.h"
@@ skipping 29 matching lines @@
         vsBuilder->codeAppendf("%s = %s;", v.vsOut(), cte.inTextureCoords()->fName);
 
         // Setup pass through color
         this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, cte.inColor(),
                                     &fColorUniform);
 
         // setup uniform viewMatrix
         this->addUniformViewMatrix(pb);
 
         // Setup position
-        SetupPosition(vsBuilder, gpArgs, cte.inPosition()->fName,
-                      cte.viewMatrix(), this->uViewM());
+        SetupPosition(vsBuilder, gpArgs, cte.inPosition()->fName, cte.viewMatrix(), this->uViewM());
 
         // emit transforms
         this->emitTransforms(args.fPB, gpArgs->fPositionVar, cte.inPosition()->fName,
                              cte.localMatrix(), args.fTransformsIn, args.fTransformsOut);
 
         GrGLGPFragmentBuilder* fsBuilder = pb->getFragmentShaderBuilder();
-        fsBuilder->codeAppendf("%s = ", args.fOutputCoverage);
-        fsBuilder->appendTextureLookup(args.fSamplers[0], v.fsIn(), kVec2f_GrSLType);
-        fsBuilder->codeAppend(";");
+        if (cte.maskFormat() == kARGB_GrMaskFormat) {
+            fsBuilder->codeAppendf("%s = ", args.fOutputColor);
+            fsBuilder->appendTextureLookupAndModulate(args.fOutputColor,
+                                                      args.fSamplers[0],
+                                                      v.fsIn(),
+                                                      kVec2f_GrSLType);
+            fsBuilder->codeAppend(";");
+            fsBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
+        } else {
+            fsBuilder->codeAppendf("%s = ", args.fOutputCoverage);
+            fsBuilder->appendTextureLookup(args.fSamplers[0], v.fsIn(), kVec2f_GrSLType);
+            fsBuilder->codeAppend(";");
+        }
     }
 
     virtual void setData(const GrGLProgramDataManager& pdman,
                          const GrPrimitiveProcessor& gp,
                          const GrBatchTracker& bt) SK_OVERRIDE {
         this->setUniformViewMatrix(pdman, gp.viewMatrix());
 
         const BitmapTextBatchTracker& local = bt.cast<BitmapTextBatchTracker>();
         if (kUniform_GrGPInput == local.fInputColorType && local.fColor != fColor) {
             GrGLfloat c[4];
             GrColorToRGBAFloat(local.fColor, c);
             pdman.set4fv(fColorUniform, 1, c);
             fColor = local.fColor;
         }
     }
 
     static inline void GenKey(const GrGeometryProcessor& proc,
                               const GrBatchTracker& bt,
                               const GrGLCaps&,
                               GrProcessorKeyBuilder* b) {
         const BitmapTextBatchTracker& local = bt.cast<BitmapTextBatchTracker>();
         // We have to put the optional vertex attribute as part of the key.  See the comment
         // on addVertexAttrib.
         // TODO When we have deferred geometry we can fix this
         const GrBitmapTextGeoProc& gp = proc.cast<GrBitmapTextGeoProc>();
         uint32_t key = 0;
         key |= SkToBool(gp.inColor()) ? 0x1 : 0x0;
         key |= local.fUsesLocalCoords && proc.localMatrix().hasPerspective() ? 0x2 : 0x0;
-        key |= ComputePosKey(gp.viewMatrix()) << 2;
+        key |= gp.maskFormat() == kARGB_GrMaskFormat ? 0x4 : 0x0;
+        key |= ComputePosKey(gp.viewMatrix()) << 3;
         b->add32(local.fInputColorType << 16 | key);
     }
 
 private:
     GrColor fColor;
     UniformHandle fColorUniform;
 
     typedef GrGLGeometryProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture,
-                                         const GrTextureParams& params, bool useColorAttrib,
+                                         const GrTextureParams& params, GrMaskFormat format,
                                          bool opaqueVertexColors, const SkMatrix& localMatrix)
     : INHERITED(color, SkMatrix::I(), localMatrix, opaqueVertexColors)
     , fTextureAccess(texture, params)
-    , fInColor(NULL) {
+    , fInColor(NULL)
+    , fMaskFormat(format) {
     this->initClassID<GrBitmapTextGeoProc>();
     fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
-    if (useColorAttrib) {
+
+    bool hasVertexColor = kA8_GrMaskFormat == fMaskFormat;
+    if (hasVertexColor) {
         fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
         this->setHasVertexColor();
     }
     fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
-                                                          kVec2f_GrVertexAttribType));
+                                                        kVec2f_GrVertexAttribType));
     this->addTextureAccess(&fTextureAccess);
 }
 
 bool GrBitmapTextGeoProc::onIsEqual(const GrGeometryProcessor& other) const {
     const GrBitmapTextGeoProc& gp = other.cast<GrBitmapTextGeoProc>();
     return SkToBool(this->inColor()) == SkToBool(gp.inColor());
 }
 
-void GrBitmapTextGeoProc::onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const {
-    if (GrPixelConfigIsAlphaOnly(this->texture(0)->config())) {
-        out->setUnknownSingleComponent();
-    } else if (GrPixelConfigIsOpaque(this->texture(0)->config())) {
-        out->setUnknownOpaqueFourComponents();
-        out->setUsingLCDCoverage();
-    } else {
+void GrBitmapTextGeoProc::onGetInvariantOutputColor(GrInitInvariantOutput* out) const {
+    if (kARGB_GrMaskFormat == fMaskFormat) {
         out->setUnknownFourComponents();
-        out->setUsingLCDCoverage();
     }
 }
 
+void GrBitmapTextGeoProc::onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const {
+    if (kARGB_GrMaskFormat != fMaskFormat) {
+        if (GrPixelConfigIsAlphaOnly(this->texture(0)->config())) {
+            out->setUnknownSingleComponent();
+        } else if (GrPixelConfigIsOpaque(this->texture(0)->config())) {
+            out->setUnknownOpaqueFourComponents();
+            out->setUsingLCDCoverage();
+        } else {
+            out->setUnknownFourComponents();
+            out->setUsingLCDCoverage();
+        }
+    } else {
+        out->setKnownSingleComponent(0xff);
+    }
+}
+
 void GrBitmapTextGeoProc::getGLProcessorKey(const GrBatchTracker& bt,
                                             const GrGLCaps& caps,
                                             GrProcessorKeyBuilder* b) const {
     GrGLBitmapTextGeoProc::GenKey(*this, bt, caps, b);
 }
 
 GrGLPrimitiveProcessor*
 GrBitmapTextGeoProc::createGLInstance(const GrBatchTracker& bt,
                                       const GrGLCaps& caps) const {
     return SkNEW_ARGS(GrGLBitmapTextGeoProc, (*this, bt));
@@ skipping 32 matching lines @@
         SkShader::kRepeat_TileMode,
         SkShader::kMirror_TileMode,
     };
     SkShader::TileMode tileModes[] = {
         kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
         kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
     };
     GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
                                                            GrTextureParams::kNone_FilterMode);
 
+    GrMaskFormat format;
+    switch (random->nextULessThan(3)) {
+        default:
+            SkFAIL("Incomplete enum\n");
+        case 0:
+            format = kA8_GrMaskFormat;
+            break;
+        case 1:
+            format = kA565_GrMaskFormat;
+            break;
+        case 2:
+            format = kARGB_GrMaskFormat;
+            break;
+    }
+
     return GrBitmapTextGeoProc::Create(GrRandomColor(random), textures[texIdx], params,
-                                       random->nextBool(), random->nextBool(),
+                                       format, random->nextBool(),
                                        GrProcessorUnitTest::TestMatrix(random));
 }