| Index: src/gpu/GrClipMaskManager.h
|
| diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
|
| index 015c801d547f1fd3be6cd5ea4cf83c7da0ea5446..f44a8e7b227499c6b81671526bcba9276a208fc3 100644
|
| --- a/src/gpu/GrClipMaskManager.h
|
| +++ b/src/gpu/GrClipMaskManager.h
|
| @@ -103,18 +103,19 @@ private:
|
| GrClipMaskCache fAACache; // cache for the AA path
|
|
|
| // Draws the clip into the stencil buffer
|
| - bool createStencilClipMask(GrReducedClip::InitialState initialState,
|
| + bool createStencilClipMask(int32_t elementsGenID,
|
| + GrReducedClip::InitialState initialState,
|
| const GrReducedClip::ElementList& elements,
|
| const SkIRect& clipSpaceIBounds,
|
| const SkIPoint& clipSpaceToStencilOffset);
|
| // Creates an alpha mask of the clip. The mask is a rasterization of elements through the
|
| // rect specified by clipSpaceIBounds.
|
| - GrTexture* createAlphaClipMask(int32_t clipStackGenID,
|
| + GrTexture* createAlphaClipMask(int32_t elementsGenID,
|
| GrReducedClip::InitialState initialState,
|
| const GrReducedClip::ElementList& elements,
|
| const SkIRect& clipSpaceIBounds);
|
| // Similar to createAlphaClipMask but it rasterizes in SW and uploads to the result texture.
|
| - GrTexture* createSoftwareClipMask(int32_t clipStackGenID,
|
| + GrTexture* createSoftwareClipMask(int32_t elementsGenID,
|
| GrReducedClip::InitialState initialState,
|
| const GrReducedClip::ElementList& elements,
|
| const SkIRect& clipSpaceIBounds);
|
| @@ -122,7 +123,7 @@ private:
|
| // Gets a texture to use for the clip mask. If true is returned then a cached mask was found
|
| // that already contains the rasterization of the clip stack, otherwise an uninitialized texture
|
| // is returned. 'willUpload' is set when the alpha mask needs to be uploaded from the CPU.
|
| - bool getMaskTexture(int32_t clipStackGenID,
|
| + bool getMaskTexture(int32_t elementsGenID,
|
| const SkIRect& clipSpaceIBounds,
|
| GrTexture** result,
|
| bool willUpload);
|
|
|