diff options
| author |  Mike Reed <reed@google.com> | 2017-03-03 13:58:10 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-03 19:39:43 +0000 |
| commit | cfaa63237b152ae216f1351207bce3ea9808814c (patch) | |
| tree | 4812b9bc5f6c8908ec2de778ef31c1447bc181a6 /src/gpu/GrRenderTargetOpList.cpp | |
| parent | b7115c68baef47b88f70b14d408e6cf5fab523f7 (diff) | |
Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
passes new (augmented) CanvasClipType unittest
fixed rasterclipstack::setnewsize
This reverts commit ea5e676a7b75600edcde3912886486004ccd7626.
BUG=skia:
Change-Id: I004653e0f4d01454662f8516fccab0046486f273
Reviewed-on: https://skia-review.googlesource.com/9185
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetOpList.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetOpList.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp index 4fc898c3ac..c95fe6af7a 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -547,10 +547,10 @@ void GrRenderTargetOpList::forwardCombine() { if (j == i +1) { // We assume op would have combined with candidate when the candidate was added // via backwards combining in recordOp. -#ifndef SK_USE_DEVICE_CLIPPING + // not sure why this fires with device-clipping in gm/complexclip4.cpp - SkASSERT(!op->combineIfPossible(candidate.fOp.get(), *this->caps())); -#endif +// SkASSERT(!op->combineIfPossible(candidate.fOp.get(), *this->caps())); + } else if (op->combineIfPossible(candidate.fOp.get(), *this->caps())) { GrOP_INFO("\t\tCombining with (%s, B%u)\n", candidate.fOp->name(), candidate.fOp->uniqueID()); |