diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-09 16:10:24 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-09 16:10:24 +0000 |
| commit | 6b67e21b6549598254c1ffa4243bf32615d90fb6 (patch) | |
| tree | a8fbac0a84569727856e84d77fa4319050eb5e26 /src/gpu/GrTextContext.cpp | |
| parent | 8f9cbd62ec108d410b91155dcf6a4789c641246f (diff) | |
roll more changes from r2830 back in
git-svn-id: http://skia.googlecode.com/svn/trunk@2842 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrTextContext.cpp')
| -rw-r--r-- | src/gpu/GrTextContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp index 3b3841b293..48cddabf6d 100644 --- a/src/gpu/GrTextContext.cpp +++ b/src/gpu/GrTextContext.cpp @@ -50,13 +50,13 @@ void GrTextContext::flushGlyphs() { } // setup blend so that we get mask * paintColor + (1-mask)*dstColor drawState->setBlendConstant(fPaint.fColor); - fDrawTarget->setBlendFunc(kConstC_BlendCoeff, kISC_BlendCoeff); + drawState->setBlendFunc(kConstC_BlendCoeff, kISC_BlendCoeff); // don't modulate by the paint's color in the frag since we're // already doing it via the blend const. drawState->setColor(0xffffffff); } else { // set back to normal in case we took LCD path previously. - fDrawTarget->setBlendFunc(fPaint.fSrcBlendCoeff, fPaint.fDstBlendCoeff); + drawState->setBlendFunc(fPaint.fSrcBlendCoeff, fPaint.fDstBlendCoeff); drawState->setColor(fPaint.fColor); } |