diff options
| author |  bsalomon <bsalomon@google.com> | 2015-09-22 11:38:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-22 11:38:46 -0700 |
| commit | aca31fea8ca620bfdb2887641b7ba56e401a72d7 (patch) | |
| tree | 9caecaf595521a246cd81aeb74dbd7756046ed18 /include/gpu | |
| parent | a16e8bcef165aabb2463339e80fdd6f1fa19b8b9 (diff) | |
Stop supporting HW dither
Review URL: https://codereview.chromium.org/1359833004
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrPaint.h | 8 | ||||
| -rw-r--r-- | include/gpu/SkGr.h | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h index 51a49210c6..d52c6baec9 100644 --- a/include/gpu/GrPaint.h +++ b/include/gpu/GrPaint.h @@ -57,12 +57,6 @@ public: void setAntiAlias(bool aa) { fAntiAlias = aa; } bool isAntiAlias() const { return fAntiAlias; } - /** - * Should dithering be applied. Defaults to false. - */ - void setDither(bool dither) { fDither = dither; } - bool isDither() const { return fDither; } - const GrXPFactory* setXPFactory(const GrXPFactory* xpFactory) { fXPFactory.reset(SkRef(xpFactory)); return xpFactory; @@ -122,7 +116,6 @@ public: GrPaint& operator=(const GrPaint& paint) { fAntiAlias = paint.fAntiAlias; - fDither = paint.fDither; fColor = paint.fColor; this->resetFragmentProcessors(); @@ -169,7 +162,6 @@ private: SkSTArray<2, const GrFragmentProcessor*, true> fCoverageFragmentProcessors; bool fAntiAlias; - bool fDither; GrColor fColor; GrProcessorDataManager fProcDataManager; diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index 2d1b95df85..145d4090b7 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -115,14 +115,14 @@ GrTexture* GrCreateTextureForPixels(GrContext*, const GrUniqueKey& optionalKey, // an optimization where the color filter can be applied to the SkPaint's // color once while converting to GrPaint and then ignored. TODO: Remove this // bool and use the invariant info to automatically apply the color filter. -bool SkPaint2GrPaintNoShader(GrContext* context, GrRenderTarget*, const SkPaint& skPaint, - GrColor paintColor, bool constantColor, GrPaint* grPaint); +bool SkPaint2GrPaintNoShader(GrContext* context, const SkPaint& skPaint, GrColor paintColor, + bool constantColor, GrPaint* grPaint); // This function is similar to skPaint2GrPaintNoShader but also converts // skPaint's shader to a GrFragmentProcessor if possible. // constantColor has the same meaning as in skPaint2GrPaintNoShader. -bool SkPaint2GrPaint(GrContext* context, GrRenderTarget*, const SkPaint& skPaint, - const SkMatrix& viewM, bool constantColor, GrPaint* grPaint); +bool SkPaint2GrPaint(GrContext* context, const SkPaint& skPaint, const SkMatrix& viewM, + bool constantColor, GrPaint* grPaint); SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque); |