diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 20:02:08 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 20:02:22 +0000 |
| commit | 073285c0595d46205d1482cc19af2d7d891bfeae (patch) | |
| tree | f127dd2c03ef707cd47396be0bf1cbf911403849 /src/gpu/GrSWMaskHelper.h | |
| parent | 3944484020d98ff8f386378296106c321279482b (diff) | |
Revert "Reland "Remove antialiasing control from GrPaint.""
This reverts commit 3944484020d98ff8f386378296106c321279482b.
Reason for revert: Merges badly with a recent change. Will rebase and reland.
Original change's description:
> Reland "Remove antialiasing control from GrPaint."
>
> This contains fixes for GLPrograms test and mixed samples rendering.
>
> This reverts commit 419d81eed4a010e6080db199795117cbedf9e6e4.
>
> BUG=skia:
>
> Change-Id: If8f002fbfaaaab6d1607403f2b15ccc7f1e17e87
> Reviewed-on: https://skia-review.googlesource.com/5763
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
BUG=skia:
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Iff9657041e28604a845bc5a9acec7c9b248c53bd
Reviewed-on: https://skia-review.googlesource.com/5772
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrSWMaskHelper.h')
| -rw-r--r-- | src/gpu/GrSWMaskHelper.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrSWMaskHelper.h b/src/gpu/GrSWMaskHelper.h index 0669db9f1b..1846733dd9 100644 --- a/src/gpu/GrSWMaskHelper.h +++ b/src/gpu/GrSWMaskHelper.h @@ -9,7 +9,6 @@ #define GrSWMaskHelper_DEFINED #include "GrColor.h" -#include "GrRenderTargetContext.h" #include "GrTextureProvider.h" #include "SkAutoPixmapStorage.h" #include "SkBitmap.h" @@ -52,10 +51,10 @@ public: bool init(const SkIRect& resultBounds, const SkMatrix* matrix); // Draw a single rect into the accumulation bitmap using the specified op - void drawRect(const SkRect& rect, SkRegion::Op op, GrAA, uint8_t alpha); + void drawRect(const SkRect& rect, SkRegion::Op op, bool antiAlias, uint8_t alpha); // Draw a single path into the accumuation bitmap using the specified op - void drawShape(const GrShape&, SkRegion::Op op, GrAA, uint8_t alpha); + void drawShape(const GrShape&, SkRegion::Op op, bool antiAlias, uint8_t alpha); // Move the mask generation results from the internal bitmap to the gpu. void toTexture(GrTexture* texture); @@ -68,6 +67,7 @@ public: fPixels.erase(SkColorSetARGB(alpha, 0xFF, 0xFF, 0xFF)); } + enum class TextureType { kExactFit, kApproximateFit @@ -78,7 +78,7 @@ public: static GrTexture* DrawShapeMaskToTexture(GrTextureProvider*, const GrShape&, const SkIRect& resultBounds, - GrAA, + bool antiAlias, TextureType, const SkMatrix* matrix); |