commit 5478d427c6e67c986a3390162c8fec77c466058a
author joshualitt <joshualitt@chromium.org> Fri Nov 14 16:00:38 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 14 16:00:38 2014 -0800
tree 2dabf11f5510aedbb8d59dc607088af0e4b7ab36
parent 28562a01999d49abcbd60abbfba06f2ac8046f6d

Push creation of default GP to the caller

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/715903002

src/gpu/GrBitmapTextContext.cpp

diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 41dc784..50fe9ca 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -7,6 +7,7 @@
 
 #include "GrBitmapTextContext.h"
 #include "GrAtlas.h"
+#include "GrDefaultGeoProcFactory.h"
 #include "GrDrawTarget.h"
 #include "GrFontScaler.h"
 #include "GrIndexBuffer.h"
@@ -14,8 +15,6 @@
 #include "GrTexturePriv.h"
 #include "GrTextStrike.h"
 #include "GrTextStrike_impl.h"
-#include "effects/GrCustomCoordsTextureEffect.h"
-#include "effects/GrSimpleTextureEffect.h"
 
 #include "SkAutoKern.h"
 #include "SkColorPriv.h"
@@ -29,6 +28,9 @@
 #include "SkStrokeRec.h"
 #include "SkTextMapStateProc.h"
 
+#include "effects/GrCustomCoordsTextureEffect.h"
+#include "effects/GrSimpleTextureEffect.h"
+
 SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
                 "Dump the contents of the font cache before every purge.");
 
@@ -42,11 +44,6 @@
 static const size_t kLCDTextVASize = 2 * sizeof(SkPoint);
 
 // position + local coord
-extern const GrVertexAttrib gColorVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,               kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint), kLocalCoord_GrVertexAttribBinding}
-};
-
 static const size_t kColorTextVASize = 2 * sizeof(SkPoint);
 
 // position + color + texture coord
@@ -360,8 +357,8 @@
         drawTarget->drawState()->setVertexAttribs<gGrayVertexAttribs>(
                                     SK_ARRAY_COUNT(gGrayVertexAttribs), kGrayTextVASize);
     } else if (kARGB_GrMaskFormat == maskFormat) {
-        drawTarget->drawState()->setVertexAttribs<gColorVertexAttribs>(
-                                    SK_ARRAY_COUNT(gColorVertexAttribs), kColorTextVASize);
+        GrDefaultGeoProcFactory::SetAttribs(drawTarget->drawState(),
+                                            GrDefaultGeoProcFactory::kLocalCoord_GPType);
     } else {
         drawTarget->drawState()->setVertexAttribs<gLCDVertexAttribs>(
                                     SK_ARRAY_COUNT(gLCDVertexAttribs), kLCDTextVASize);
@@ -564,6 +561,7 @@
 
         // This effect could be stored with one of the cache objects (atlas?)
         if (kARGB_GrMaskFormat == fCurrMaskFormat) {
+            drawState->setGeometryProcessor(GrDefaultGeoProcFactory::Create(true))->unref();
             GrFragmentProcessor* fragProcessor = GrSimpleTextureEffect::Create(fCurrTexture,
                                                                                SkMatrix::I(),
                                                                                params);