diff options
| author |  cdalton <cdalton@nvidia.com> | 2016-05-13 10:25:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-13 10:25:00 -0700 |
| commit | 846c051a4800b3cea341a0195db24297d6d9047f (patch) | |
| tree | 7dadb5396d2dad36a45686c9c10ada5bc2e76f01 /tools | |
| parent | 670f01f2fc88f02ec9a6f1b47af29daeadc3b301 (diff) | |
Convert GrClip to an abstract base class
Converts GrClip to an abstract base class and adds a "GrFixedClip"
implementation. GrFixedClip denotes a clip implemented with fixed-
function hardware. GrFixedClip allows us to remove the stateful
"fClipMode" member from GrClipMaskManager, and in the future will
be able to nicely encapsulate window rectangles.
After this change GrClipMaskManager is just a wrapper around
GrDrawTarget. We may want to consider removing it altogether.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1971343002
Review-Url: https://codereview.chromium.org/1971343002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 874567dc62..a301c747ca 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -168,8 +168,7 @@ void SkGpuDevice::drawTexture(GrTexture* tex, const SkRect& dst, const SkPaint& grPaint.addColorTextureProcessor(tex, textureMat); - GrClip clip; - fDrawContext->drawRect(clip, grPaint, mat, dst); + fDrawContext->drawRect(GrNoClip(), grPaint, mat, dst); } @@ -260,8 +259,11 @@ void GrDrawContextPriv::testingOnly_drawBatch(const GrPipelineBuilder& pipelineB SkDEBUGCODE(fDrawContext->validate();) GR_AUDIT_TRAIL_AUTO_FRAME(fDrawContext->fAuditTrail, "GrDrawContext::testingOnly_drawBatch"); - const GrClip& drawClip = clip ? *clip : GrClip::WideOpen(); - fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, drawClip, batch); + if (clip) { + fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, *clip, batch); + } else { + fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, GrNoClip(), batch); + } } #undef ASSERT_SINGLE_OWNER |