diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-02 13:11:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-02 13:11:22 +0000 |
| commit | 37d883d9d3c5945e9d121830bdcd1935160fd53b (patch) | |
| tree | bba207074ac7126dadc92c0376355a30d6a89395 /include | |
| parent | f6a90332ae21414cf19630764d4371ffd24ac0cc (diff) | |
Disable AA for ovals and roundrects if MSAA is enabled.
Also remove GrPaint from a number of methods -- we only
use it to get the AA state.
R=bsalomon@google.com
Author: jvanverth@google.com
Review URL: https://chromiumcodereview.appspot.com/14109033
git-svn-id: http://skia.googlecode.com/svn/trunk@8954 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrContext.h | 2 | ||||
| -rw-r--r-- | include/gpu/GrOvalRenderer.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index d8a7f91d55..0cdb4fbf25 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -902,7 +902,7 @@ private: /// draw state is left unmodified. GrDrawTarget* prepareToDraw(const GrPaint*, BufferedDraw); - void internalDrawPath(GrDrawTarget* target, const GrPaint& paint, const SkPath& path, + void internalDrawPath(GrDrawTarget* target, bool useAA, const SkPath& path, const SkStrokeRec& stroke); GrTexture* createResizedTexture(const GrTextureDesc& desc, diff --git a/include/gpu/GrOvalRenderer.h b/include/gpu/GrOvalRenderer.h index 0f6809db98..a6ec52c7a8 100644 --- a/include/gpu/GrOvalRenderer.h +++ b/include/gpu/GrOvalRenderer.h @@ -29,16 +29,16 @@ public: GrOvalRenderer() : fRRectIndexBuffer(NULL) {} ~GrOvalRenderer() {} - bool drawOval(GrDrawTarget* target, const GrContext* context, const GrPaint& paint, + bool drawOval(GrDrawTarget* target, const GrContext* context, bool useAA, const GrRect& oval, const SkStrokeRec& stroke); - bool drawSimpleRRect(GrDrawTarget* target, GrContext* context, const GrPaint& paint, + bool drawSimpleRRect(GrDrawTarget* target, GrContext* context, bool useAA, const SkRRect& rrect, const SkStrokeRec& stroke); private: - bool drawEllipse(GrDrawTarget* target, const GrPaint& paint, + bool drawEllipse(GrDrawTarget* target, bool useAA, const GrRect& ellipse, const SkStrokeRec& stroke); - void drawCircle(GrDrawTarget* target, const GrPaint& paint, + void drawCircle(GrDrawTarget* target, bool useAA, const GrRect& circle, const SkStrokeRec& stroke); |