AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup GLPrograms textblob todo

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1730253002

Review URL: https://codereview.chromium.org/1730253002
This commit is contained in:
joshualitt 2016-02-24 09:23:03 -08:00 committed by Commit bot
parent d78c088b61
commit b8d864902b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/text/GrAtlasTextContext.cpp
View File

@ -389,8 +389,14 @@ DRAW_BATCH_TEST_DEFINE(TextBlobBatch) {
const char* text = "The quick brown fox jumps over the lazy dog.";
int textLen = (int)strlen(text);
// Setup clip
GrClip clip;
// create some random x/y offsets, including negative offsets
static const int kMaxTrans = 1024;
int xPos = (random->nextU() % 2) * 2 - 1;
int yPos = (random->nextU() % 2) * 2 - 1;
int xInt = (random->nextU() % kMaxTrans) * xPos;
int yInt = (random->nextU() % kMaxTrans) * yPos;
SkScalar x = SkIntToScalar(xInt);
SkScalar y = SkIntToScalar(yInt);
// right now we don't handle textblobs, nor do we handle drawPosText. Since we only
// intend to test the batch with this unit test, that is okay.
@ -400,12 +406,8 @@ DRAW_BATCH_TEST_DEFINE(TextBlobBatch) {
*context->caps()->shaderCaps(), grPaint, skPaint,
viewMatrix,
gSurfaceProps, text,
static_cast<size_t>(textLen), 0, 0));
static_cast<size_t>(textLen), x, y));
// We'd like to be able to test this with random translations, but currently the vertex
// bounds and vertices will get out of sync
SkScalar x = 0.f;//SkIntToScalar(random->nextU());
SkScalar y = 0.f;//SkIntToScalar(random->nextU());
return blob->test_createBatch(textLen, 0, 0, viewMatrix, x, y, color, skPaint,
gSurfaceProps, gTextContext->dfAdjustTable(),
context->getBatchFontCache());