From 9deb696f58e840783e7026ae2ce3495effee299d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 22 Oct 2014 15:23:29 -0700 Subject: Revert of Oval and stroke AA rect now batch (patchset #7 id:110001 of https://codereview.chromium.org/664193002/) Reason for revert: Many GMs failing, e.g. http://build.chromium.org/p/client.skia.android/builders/Test-Android-Nexus5-Adreno330-Arm7-Release/builds/95/steps/Compare%20GMs/logs/stdio Original issue's description: > Oval and stroke AA rect now batch > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/bc54fab1a4e5b51628a8c1557c62bc74e078870d TBR=robertphillips@google.com,joshualitt@google.com,bsalomon@google.com,joshualitt@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/671993003 --- src/gpu/GrOvalRenderer.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/gpu/GrOvalRenderer.h') diff --git a/src/gpu/GrOvalRenderer.h b/src/gpu/GrOvalRenderer.h index 96f9b3afb9..92f6ff0cdf 100644 --- a/src/gpu/GrOvalRenderer.h +++ b/src/gpu/GrOvalRenderer.h @@ -24,7 +24,7 @@ class GrOvalRenderer : public SkRefCnt { public: SK_DECLARE_INST_COUNT(GrOvalRenderer) - GrOvalRenderer() : fRRectIndexBuffer(NULL), fStrokeRRectIndexBuffer(NULL) {} + GrOvalRenderer() : fRRectIndexBuffer(NULL) {} ~GrOvalRenderer() { this->reset(); } @@ -39,20 +39,19 @@ public: const SkRRect& outer, const SkRRect& inner); private: - bool drawEllipse(GrDrawTarget* target, const GrContext* context, bool useCoverageAA, + bool drawEllipse(GrDrawTarget* target, bool useCoverageAA, const SkRect& ellipse, const SkStrokeRec& stroke); - bool drawDIEllipse(GrDrawTarget* target, const GrContext* context, bool useCoverageAA, + bool drawDIEllipse(GrDrawTarget* target, bool useCoverageAA, const SkRect& ellipse, const SkStrokeRec& stroke); - void drawCircle(GrDrawTarget* target, const GrContext* context, bool useCoverageAA, + void drawCircle(GrDrawTarget* target, bool useCoverageAA, const SkRect& circle, const SkStrokeRec& stroke); - GrIndexBuffer* rRectIndexBuffer(bool isStrokeOnly, GrGpu* gpu); + GrIndexBuffer* rRectIndexBuffer(GrGpu* gpu); GrIndexBuffer* fRRectIndexBuffer; - GrIndexBuffer* fStrokeRRectIndexBuffer; typedef SkRefCnt INHERITED; }; -- cgit v1.2.3