| Index: src/gpu/GrTextContext.cpp
|
| ===================================================================
|
| --- src/gpu/GrTextContext.cpp (revision 8462)
|
| +++ src/gpu/GrTextContext.cpp (working copy)
|
| @@ -194,10 +194,9 @@
|
| if (NULL == fVertices) {
|
| // position + texture coord
|
| static const GrVertexAttrib kVertexAttribs[] = {
|
| - {kVec2f_GrVertexAttribType, 0},
|
| - {kVec2f_GrVertexAttribType, sizeof(GrPoint)}
|
| + {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding},
|
| + {kVec2f_GrVertexAttribType, sizeof(GrPoint), kEffect_GrVertexAttribBinding}
|
| };
|
| - static const GrAttribBindings kAttribBindings = 0;
|
|
|
| // If we need to reserve vertices allow the draw target to suggest
|
| // a number of verts to reserve and whether to perform a flush.
|
| @@ -215,8 +214,6 @@
|
| fDrawTarget = fContext->getTextTarget(fPaint);
|
| fDrawTarget->drawState()->setVertexAttribs(kVertexAttribs, SK_ARRAY_COUNT(kVertexAttribs));
|
| }
|
| - fDrawTarget->drawState()->setAttribIndex(GrDrawState::kPosition_AttribIndex, 0);
|
| - fDrawTarget->drawState()->setAttribBindings(kAttribBindings);
|
| fMaxVertices = kDefaultRequestedVerts;
|
| // ignore return, no point in flushing again.
|
| fDrawTarget->geometryHints(&fMaxVertices, NULL);
|
|
|