diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-12-29 15:10:07 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-29 15:10:07 -0800 |
| commit | 8059eb9f6e24ed609393fbda4ad71edea03ac258 (patch) | |
| tree | c9a8e1881739206f49a5319bf1077a5900b42db1 /src/gpu/GrBitmapTextContext.cpp | |
| parent | 4f662e62cd44e302ef689fabdb2c0ae8d9471b02 (diff) | |
Move ViewMatrix off of drawstate
BUG=skia:
Review URL: https://codereview.chromium.org/815553003
Diffstat (limited to 'src/gpu/GrBitmapTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrBitmapTextContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp index 94b2770b23..fdf96002bd 100755 --- a/src/gpu/GrBitmapTextContext.cpp +++ b/src/gpu/GrBitmapTextContext.cpp @@ -528,7 +528,7 @@ void GrBitmapTextContext::flush() { if (fCurrVertex > 0) { GrDrawState drawState; - drawState.setFromPaint(fPaint, SkMatrix::I(), fContext->getRenderTarget()); + drawState.setFromPaint(fPaint, fContext->getRenderTarget()); // setup our sampler state for our text texture/atlas SkASSERT(SkIsAlign4(fCurrVertex)); @@ -566,7 +566,7 @@ void GrBitmapTextContext::flush() { if (textureUniqueID != fEffectTextureUniqueID || fCachedGeometryProcessor->color() != color) { uint32_t flags = GrDefaultGeoProcFactory::kLocalCoord_GPType; - fCachedGeometryProcessor.reset(GrDefaultGeoProcFactory::Create(color, flags)); + fCachedGeometryProcessor.reset(GrDefaultGeoProcFactory::Create(flags, color)); fCachedTextureProcessor.reset(GrSimpleTextureEffect::Create(fCurrTexture, SkMatrix::I(), params)); |