diff options
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 db0cad5164..6edab11beb 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -537,10 +537,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())); - + SkASSERT(!op->combineIfPossible(candidate.fOp.get(), *this->caps())); +#endif } else if (op->combineIfPossible(candidate.fOp.get(), *this->caps())) { GrOP_INFO("\t\tCombining with (%s, B%u)\n", candidate.fOp->name(), candidate.fOp->uniqueID()); |