diff options
author | Brian Salomon <bsalomon@google.com> | 2016-12-08 16:57:38 +0000 |
---|---|---|
committer | Brian Salomon <bsalomon@google.com> | 2016-12-08 17:11:46 +0000 |
commit | 419d81eed4a010e6080db199795117cbedf9e6e4 (patch) | |
tree | 7e11b85514db3fe6c7c7f43f8c07d2839eda7bed /src/gpu/SkGpuDevice_drawTexture.cpp | |
parent | a92c383e2f1ceb0323aef79fa444450e6a3e1c03 (diff) |
Revert "Remove antialiasing control from GrPaint."
This reverts commit 9f549358b3ac9f61e78b194e39d6ac6eb322e35e.
Reason for revert: hitting asserts
Change-Id: I542d34edc05ecf72b7646263f25736a0950c78e7
Reviewed-on: https://skia-review.googlesource.com/5707
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/SkGpuDevice_drawTexture.cpp')
-rw-r--r-- | src/gpu/SkGpuDevice_drawTexture.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp index fe14f8ac87..93c9f18737 100644 --- a/src/gpu/SkGpuDevice_drawTexture.cpp +++ b/src/gpu/SkGpuDevice_drawTexture.cpp @@ -213,15 +213,15 @@ void SkGpuDevice::drawTextureProducerImpl(GrTextureProducer* producer, fp, producer->isAlphaOnly(), &grPaint)) { return; } - GrAA aa = GrBoolToAA(paint.isAntiAlias()); + if (canUseTextureCoordsAsLocalCoords) { - fRenderTargetContext->fillRectToRect(clip, grPaint, aa, viewMatrix, clippedDstRect, + fRenderTargetContext->fillRectToRect(clip, grPaint, viewMatrix, clippedDstRect, clippedSrcRect); return; } if (!mf) { - fRenderTargetContext->drawRect(clip, grPaint, aa, viewMatrix, clippedDstRect); + fRenderTargetContext->drawRect(clip, grPaint, viewMatrix, clippedDstRect); return; } @@ -247,6 +247,6 @@ void SkGpuDevice::drawTextureProducerImpl(GrTextureProducer* producer, rectPath.addRect(clippedDstRect); rectPath.setIsVolatile(true); GrBlurUtils::drawPathWithMaskFilter(this->context(), fRenderTargetContext.get(), fClip, - rectPath, &grPaint, aa, viewMatrix, mf, - GrStyle::SimpleFill(), true); + rectPath, &grPaint, viewMatrix, mf, GrStyle::SimpleFill(), + true); } |