commit 2dd1ae016d7f297b433c3ea3a771ef8e01657c1f
author joshualitt <joshualitt@chromium.org> Wed Dec 03 06:24:10 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 03 06:24:10 2014 -0800
tree 96aa03d4b4b1802490cb5b769627b75f3de4a470
parent 960fb50a1a7ac76fd51e22983812f26bfffa6d1e

First step to moving vertex attributes to the geometryProcessor

BUG=skia:

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

src/gpu/GrAADistanceFieldPathRenderer.cpp

diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp
index 5e0410f..6ac504a 100755
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
@@ -103,13 +103,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// position + texture coord
-extern const GrVertexAttrib gSDFPathVertexAttribs[] = {
-    { kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding },
-    { kVec2f_GrVertexAttribType, sizeof(SkPoint), kGeometryProcessor_GrVertexAttribBinding }
-};
-static const size_t kSDFPathVASize = 2 * sizeof(SkPoint);
-
 bool GrAADistanceFieldPathRenderer::onDrawPath(GrDrawTarget* target,
                                                GrDrawState* drawState,
                                                const SkPath& path,
@@ -322,12 +315,25 @@
     GrDrawTarget::DrawToken drawToken = target->getCurrentDrawToken();
     pathData->fPlot->setDrawToken(drawToken);
     
-    // make me some vertices
-    drawState->setVertexAttribs<gSDFPathVertexAttribs>(SK_ARRAY_COUNT(gSDFPathVertexAttribs),
-                                                       kSDFPathVASize);
+    // set up any flags
+    uint32_t flags = 0;
+    const SkMatrix& vm = drawState->getViewMatrix();
+    flags |= vm.isSimilarity() ? kSimilarity_DistanceFieldEffectFlag : 0;
+
+    GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kBilerp_FilterMode);
+    if (flags != fEffectFlags) {
+        fCachedGeometryProcessor.reset(GrDistanceFieldNoGammaTextureEffect::Create(texture,
+                                                                                   params,
+                                                                                   flags));
+        fEffectFlags = flags;
+    }
+    drawState->setGeometryProcessor(fCachedGeometryProcessor.get());
+
     void* vertices = NULL;
-    bool success = target->reserveVertexAndIndexSpace(4, drawState->getVertexStride(), 0, &vertices,
-                                                      NULL);
+    bool success = target->reserveVertexAndIndexSpace(4,
+                                                      fCachedGeometryProcessor->getVertexStride(),
+                                                      0, &vertices, NULL);
+    SkASSERT(fCachedGeometryProcessor->getVertexStride() == 2 * sizeof(SkPoint));
     GrAlwaysAssert(success);
     
     SkScalar dx = pathData->fBounds.fLeft;
@@ -361,20 +367,6 @@
                               SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty + th)),
                               vertSize);
     
-    // set up any flags
-    uint32_t flags = 0;
-    const SkMatrix& vm = drawState->getViewMatrix();
-    flags |= vm.isSimilarity() ? kSimilarity_DistanceFieldEffectFlag : 0;
-    
-    GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kBilerp_FilterMode);
-    if (flags != fEffectFlags) {
-        fCachedGeometryProcessor.reset(GrDistanceFieldNoGammaTextureEffect::Create(texture,
-                                                                                   params,
-                                                                                   flags));
-        fEffectFlags = flags;
-    }
-    drawState->setGeometryProcessor(fCachedGeometryProcessor.get());
-
     vm.mapRect(&r);
     target->setIndexSourceToBuffer(fContext->getQuadIndexBuffer());
     target->drawIndexedInstances(drawState, kTriangles_GrPrimitiveType, 1, 4, 6, &r);