Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index 8f078dbc4543aaae82c653616ed02f26554bc024..aeeb85d2e154a13d4c9177457ec782d1d51204ed 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -460,11 +460,7 @@ void GrOvalRenderer::reset() { |
bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, bool useAA, |
const SkRect& oval, const SkStrokeRec& stroke) |
{ |
- bool useCoverageAA = useAA && |
- !target->getDrawState().getRenderTarget()->isMultisampled() && |
- !target->shouldDisableCoverageAAForBlend(); |
- |
- if (!useCoverageAA) { |
+ if (!useAA) { |
return false; |
} |
@@ -473,13 +469,13 @@ bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, bo |
// we can draw circles |
if (SkScalarNearlyEqual(oval.width(), oval.height()) |
&& circle_stays_circle(vm)) { |
- this->drawCircle(target, useCoverageAA, oval, stroke); |
+ this->drawCircle(target, useAA, oval, stroke); |
// if we have shader derivative support, render as device-independent |
} else if (target->caps()->shaderDerivativeSupport()) { |
- return this->drawDIEllipse(target, useCoverageAA, oval, stroke); |
+ return this->drawDIEllipse(target, useAA, oval, stroke); |
// otherwise axis-aligned ellipses only |
} else if (vm.rectStaysRect()) { |
- return this->drawEllipse(target, useCoverageAA, oval, stroke); |
+ return this->drawEllipse(target, useAA, oval, stroke); |
} else { |
return false; |
} |
@@ -496,7 +492,7 @@ extern const GrVertexAttrib gCircleVertexAttribs[] = { |
}; |
void GrOvalRenderer::drawCircle(GrDrawTarget* target, |
- bool useCoverageAA, |
+ bool useAA, |
const SkRect& circle, |
const SkStrokeRec& stroke) |
{ |
@@ -601,7 +597,7 @@ extern const GrVertexAttrib gDIEllipseVertexAttribs[] = { |
}; |
bool GrOvalRenderer::drawEllipse(GrDrawTarget* target, |
- bool useCoverageAA, |
+ bool useAA, |
const SkRect& ellipse, |
const SkStrokeRec& stroke) |
{ |
@@ -610,7 +606,7 @@ bool GrOvalRenderer::drawEllipse(GrDrawTarget* target, |
{ |
// we should have checked for this previously |
bool isAxisAlignedEllipse = drawState->getViewMatrix().rectStaysRect(); |
- SkASSERT(useCoverageAA && isAxisAlignedEllipse); |
+ SkASSERT(useAA && isAxisAlignedEllipse); |
} |
#endif |
@@ -733,7 +729,7 @@ bool GrOvalRenderer::drawEllipse(GrDrawTarget* target, |
} |
bool GrOvalRenderer::drawDIEllipse(GrDrawTarget* target, |
- bool useCoverageAA, |
+ bool useAA, |
const SkRect& ellipse, |
const SkStrokeRec& stroke) |
{ |
@@ -886,12 +882,8 @@ GrIndexBuffer* GrOvalRenderer::rRectIndexBuffer(GrGpu* gpu) { |
bool GrOvalRenderer::drawSimpleRRect(GrDrawTarget* target, GrContext* context, bool useAA, |
const SkRRect& rrect, const SkStrokeRec& stroke) |
{ |
- bool useCoverageAA = useAA && |
- !target->getDrawState().getRenderTarget()->isMultisampled() && |
- !target->shouldDisableCoverageAAForBlend(); |
- |
// only anti-aliased rrects for now |
- if (!useCoverageAA) { |
+ if (!useAA) { |
return false; |
} |
@@ -899,7 +891,7 @@ bool GrOvalRenderer::drawSimpleRRect(GrDrawTarget* target, GrContext* context, b |
#ifdef SK_DEBUG |
{ |
// we should have checked for this previously |
- SkASSERT(useCoverageAA && vm.rectStaysRect() && rrect.isSimple()); |
+ SkASSERT(useAA && vm.rectStaysRect() && rrect.isSimple()); |
} |
#endif |