| Index: src/gpu/GrClipMaskManager.cpp
|
| diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
|
| index d753258868ef3a5028b20aaa6b27cfcbecd14758..35243120a48e8eaee37337275af0b982fd5fc015 100644
|
| --- a/src/gpu/GrClipMaskManager.cpp
|
| +++ b/src/gpu/GrClipMaskManager.cpp
|
| @@ -214,7 +214,7 @@ bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn,
|
| const SkRect* devBounds,
|
| GrDrawState::AutoRestoreEffects* are,
|
| GrDrawState::AutoRestoreStencil* ars,
|
| - GrDrawTarget::ScissorState* scissorState) {
|
| + ScissorState* scissorState) {
|
| fCurrClipMaskType = kNone_ClipMaskType;
|
|
|
| GrReducedClip::ElementList elements(16);
|
| @@ -731,8 +731,9 @@ bool GrClipMaskManager::createStencilClipMask(int32_t elementsGenID,
|
| SkASSERT((clipBit <= 16) && "Ganesh only handles 16b or smaller stencil buffers");
|
| clipBit = (1 << (clipBit-1));
|
|
|
| - fGpu->clearStencilClip(rt, stencilSpaceIBounds,
|
| - GrReducedClip::kAllIn_InitialState == initialState);
|
| + fGpu->clearStencilClip(stencilSpaceIBounds,
|
| + GrReducedClip::kAllIn_InitialState == initialState,
|
| + rt);
|
|
|
| // walk through each clip element and perform its set op
|
| // with the existing clip.
|
|
|