Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: src/gpu/text/GrAtlasTextContext.cpp

Issue 1730253002: fixup GLPrograms textblob todo (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: fix comment Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "GrAtlasTextContext.h" 7 #include "GrAtlasTextContext.h"
8 8
9 #include "GrDrawContext.h" 9 #include "GrDrawContext.h"
10 #include "GrDrawTarget.h" 10 #include "GrDrawTarget.h"
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 skPaint.setSubpixelText(random->nextBool()); 382 skPaint.setSubpixelText(random->nextBool());
383 383
384 GrPaint grPaint; 384 GrPaint grPaint;
385 if (!SkPaintToGrPaint(context, skPaint, viewMatrix, &grPaint)) { 385 if (!SkPaintToGrPaint(context, skPaint, viewMatrix, &grPaint)) {
386 SkFAIL("couldn't convert paint\n"); 386 SkFAIL("couldn't convert paint\n");
387 } 387 }
388 388
389 const char* text = "The quick brown fox jumps over the lazy dog."; 389 const char* text = "The quick brown fox jumps over the lazy dog.";
390 int textLen = (int)strlen(text); 390 int textLen = (int)strlen(text);
391 391
392 // Setup clip 392 // create some random x/y offsets, including negative offsets
393 GrClip clip; 393 static const int kMaxTrans = 1024;
394 394 int xPos = (random->nextU() % 2) * 2 - 1;
395 int yPos = (random->nextU() % 2) * 2 - 1;
396 int xInt = (random->nextU() % kMaxTrans) * xPos;
397 int yInt = (random->nextU() % kMaxTrans) * yPos;
398 SkScalar x = SkIntToScalar(xInt);
399 SkScalar y = SkIntToScalar(yInt);
400
395 // right now we don't handle textblobs, nor do we handle drawPosText. Since we only 401 // right now we don't handle textblobs, nor do we handle drawPosText. Since we only
396 // intend to test the batch with this unit test, that is okay. 402 // intend to test the batch with this unit test, that is okay.
397 SkAutoTUnref<GrAtlasTextBlob> blob( 403 SkAutoTUnref<GrAtlasTextBlob> blob(
398 GrAtlasTextContext::CreateDrawTextBlob(context->getTextBlobCache(), 404 GrAtlasTextContext::CreateDrawTextBlob(context->getTextBlobCache(),
399 context->getBatchFontCache(), 405 context->getBatchFontCache(),
400 *context->caps()->shaderCaps(), g rPaint, skPaint, 406 *context->caps()->shaderCaps(), g rPaint, skPaint,
401 viewMatrix, 407 viewMatrix,
402 gSurfaceProps, text, 408 gSurfaceProps, text,
403 static_cast<size_t>(textLen), 0, 0)); 409 static_cast<size_t>(textLen), x, y));
404 410
405 // We'd like to be able to test this with random translations, but currently the vertex
406 // bounds and vertices will get out of sync
407 SkScalar x = 0.f;//SkIntToScalar(random->nextU());
408 SkScalar y = 0.f;//SkIntToScalar(random->nextU());
409 return blob->test_createBatch(textLen, 0, 0, viewMatrix, x, y, color, skPain t, 411 return blob->test_createBatch(textLen, 0, 0, viewMatrix, x, y, color, skPain t,
410 gSurfaceProps, gTextContext->dfAdjustTable(), 412 gSurfaceProps, gTextContext->dfAdjustTable(),
411 context->getBatchFontCache()); 413 context->getBatchFontCache());
412 } 414 }
413 415
414 #endif 416 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698