| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "GrAtlasTextBatch.h" | 8 #include "GrAtlasTextBatch.h" |
| 9 | 9 |
| 10 #include "GrBatchFontCache.h" | 10 #include "GrBatchFontCache.h" |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 texture, | 324 texture, |
| 325 params, | 325 params, |
| 326 maskFormat, | 326 maskFormat, |
| 327 localMatrix, | 327 localMatrix, |
| 328 this->usesLocalCoords())); | 328 this->usesLocalCoords())); |
| 329 } | 329 } |
| 330 | 330 |
| 331 FlushInfo flushInfo; | 331 FlushInfo flushInfo; |
| 332 flushInfo.fGlyphsToFlush = 0; | 332 flushInfo.fGlyphsToFlush = 0; |
| 333 size_t vertexStride = gp->getVertexStride(); | 333 size_t vertexStride = gp->getVertexStride(); |
| 334 SkASSERT(vertexStride == GetVertexStride(maskFormat)); | 334 SkASSERT(vertexStride == GrAtlasTextBlob::GetVertexStride(maskFormat)); |
| 335 | 335 |
| 336 target->initDraw(gp, this->pipeline()); | 336 target->initDraw(gp, this->pipeline()); |
| 337 | 337 |
| 338 int glyphCount = this->numGlyphs(); | 338 int glyphCount = this->numGlyphs(); |
| 339 const GrVertexBuffer* vertexBuffer; | 339 const GrVertexBuffer* vertexBuffer; |
| 340 | 340 |
| 341 void* vertices = target->makeVertexSpace(vertexStride, | 341 void* vertices = target->makeVertexSpace(vertexStride, |
| 342 glyphCount * kVerticesPerGlyph, | 342 glyphCount * kVerticesPerGlyph, |
| 343 &vertexBuffer, | 343 &vertexBuffer, |
| 344 &flushInfo.fVertexOffset); | 344 &flushInfo.fVertexOffset); |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 return GrDistanceFieldA8TextGeoProc::Create(color, | 553 return GrDistanceFieldA8TextGeoProc::Create(color, |
| 554 viewMatrix, | 554 viewMatrix, |
| 555 texture, | 555 texture, |
| 556 params, | 556 params, |
| 557 flags, | 557 flags, |
| 558 this->usesLocalCoords()); | 558 this->usesLocalCoords()); |
| 559 #endif | 559 #endif |
| 560 } | 560 } |
| 561 | 561 |
| 562 } | 562 } |
| OLD | NEW |