diff options
| author |  robertphillips <robertphillips@google.com> | 2015-10-26 08:33:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-26 08:33:10 -0700 |
| commit | 5c3ea4cd3921e8904d4f201bcdedfd5b8a726542 (patch) | |
| tree | 6dd7ca7a1cf6ff120496d6fe6b26f6c8db0a7682 /include/gpu | |
| parent | 950305ec77702639fe6ad1923f7b8d828ccef634 (diff) | |
Fix ClipMaskManager's SW-fallback logic
'useSWOnlyPath' was not correctly toggling between stencil and color draws so there was a mismatch with the behavior in createAlphaClipMask (i.e., we were inadvertently rendering some of the elements in a clip using SW but using stenciling for others - precisely what 'useSWOnlyPath' was intended to prevent).
Review URL: https://codereview.chromium.org/1421533007
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrContext.h | 2 | ||||
| -rw-r--r-- | include/gpu/GrPathRendererChain.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index b886560cbf..1e160c6d40 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -334,7 +334,7 @@ public: void getTestTarget(GrTestTarget*); GrPathRenderer* getPathRenderer( - const GrPipelineBuilder*, + const GrPipelineBuilder&, const SkMatrix& viewMatrix, const SkPath& path, const GrStrokeInfo& stroke, diff --git a/include/gpu/GrPathRendererChain.h b/include/gpu/GrPathRendererChain.h index a50160fba8..98441cec15 100644 --- a/include/gpu/GrPathRendererChain.h +++ b/include/gpu/GrPathRendererChain.h @@ -56,7 +56,7 @@ public: whether the path can be rendered with arbitrary stencil rules or not. See comments on StencilSupport in GrPathRenderer.h. */ GrPathRenderer* getPathRenderer(const GrShaderCaps* shaderCaps, - const GrPipelineBuilder*, + const GrPipelineBuilder&, const SkMatrix& viewMatrix, const SkPath& path, const GrStrokeInfo& stroke, |