diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-03-03 14:37:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-03 22:01:40 +0000 |
| commit | e370cbe2bf26a785017d0bef3fa3d0c170e5080a (patch) | |
| tree | 3f87625a1079897604f9781940bc136817d95c8b /src | |
| parent | 651cbe9af67b49c5a3ad3788c3a50a003827a8e2 (diff) | |
Remove clip to bounds GrContextOption
Change-Id: I02da998640a3dd8848426179a91a9105d1024f0e
Reviewed-on: https://skia-review.googlesource.com/9225
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrContext.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrRenderTargetOpList.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/GrRenderTargetOpList.h | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index a4c18523f9..cc7cba08ad 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -95,7 +95,6 @@ void GrContext::initCommon(const GrContextOptions& options) { fDidTestPMConversions = false; GrRenderTargetOpList::Options rtOpListOptions; - rtOpListOptions.fClipDrawOpsToBounds = options.fClipDrawOpsToBounds; rtOpListOptions.fMaxOpCombineLookback = options.fMaxOpCombineLookback; rtOpListOptions.fMaxOpCombineLookahead = options.fMaxOpCombineLookahead; GrPathRendererChain::Options prcOptions; diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp index 4fc898c3ac..51f55d9dfc 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -56,7 +56,6 @@ GrRenderTargetOpList::GrRenderTargetOpList(GrRenderTargetProxy* rtp, GrGpu* gpu, // TODO: Stop extracting the context (currently needed by GrClip) fContext = fGpu->getContext(); - fClipOpToBounds = options.fClipDrawOpsToBounds; fMaxOpLookback = (options.fMaxOpCombineLookback < 0) ? kDefaultMaxOpLookback : options.fMaxOpCombineLookback; fMaxOpLookahead = (options.fMaxOpCombineLookahead < 0) ? kDefaultMaxOpLookahead @@ -300,7 +299,7 @@ void GrRenderTargetOpList::addDrawOp(const GrPipelineBuilder& pipelineBuilder, } args.fCaps = this->caps(); args.fAnalysis = &analysis; - if (analysis.usesPLSDstRead() || fClipOpToBounds) { + if (analysis.usesPLSDstRead()) { GrGLIRect viewport; viewport.fLeft = 0; viewport.fBottom = 0; @@ -359,7 +358,6 @@ void GrRenderTargetOpList::stencilPath(GrRenderTargetContext* renderTargetContex if (!clip.apply(fContext, renderTargetContext, useHWAA, true, &appliedClip)) { return; } - // TODO: respect fClipOpToBounds if we ever start computing bounds here. // Coverage AA does not make sense when rendering to the stencil buffer. The caller should never // attempt this in a situation that would require coverage AA. diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h index 245ec8706b..8ecf232176 100644 --- a/src/gpu/GrRenderTargetOpList.h +++ b/src/gpu/GrRenderTargetOpList.h @@ -41,7 +41,6 @@ class GrRenderTargetOpList final : public GrOpList { public: /** Options for GrRenderTargetOpList behavior. */ struct Options { - bool fClipDrawOpsToBounds = false; int fMaxOpCombineLookback = -1; int fMaxOpCombineLookahead = -1; }; @@ -172,7 +171,6 @@ private: GrGpu* fGpu; GrResourceProvider* fResourceProvider; - bool fClipOpToBounds; int fMaxOpLookback; int fMaxOpLookahead; |