| Index: src/gpu/SkGrPriv.h
|
| diff --git a/src/gpu/SkGrPriv.h b/src/gpu/SkGrPriv.h
|
| index 5924ea647dc7045f99e2fede0c090f0d79f76a5c..7038954c9f166a182761f3126ea79a5a798e7fda 100644
|
| --- a/src/gpu/SkGrPriv.h
|
| +++ b/src/gpu/SkGrPriv.h
|
| @@ -48,12 +48,14 @@ void GrInstallBitmapUniqueKeyInvalidator(const GrUniqueKey& key, SkPixelRef* pix
|
| bool SkPaintToGrPaint(GrContext*,
|
| const SkPaint& skPaint,
|
| const SkMatrix& viewM,
|
| - GrPaint* grPaint);
|
| + GrPaint* grPaint,
|
| + GrRenderTarget*);
|
|
|
| /** Same as above but ignores the SkShader (if any) on skPaint. */
|
| bool SkPaintToGrPaintNoShader(GrContext* context,
|
| const SkPaint& skPaint,
|
| - GrPaint* grPaint);
|
| + GrPaint* grPaint,
|
| + GrRenderTarget*);
|
|
|
| /** Replaces the SkShader (if any) on skPaint with the passed in GrFragmentProcessor. The processor
|
| should expect an unpremul input color and produce a premultiplied output color. There is
|
| @@ -61,7 +63,8 @@ bool SkPaintToGrPaintNoShader(GrContext* context,
|
| bool SkPaintToGrPaintReplaceShader(GrContext*,
|
| const SkPaint& skPaint,
|
| const GrFragmentProcessor* shaderFP,
|
| - GrPaint* grPaint);
|
| + GrPaint* grPaint,
|
| + GrRenderTarget*);
|
|
|
| /** Blends the SkPaint's shader (or color if no shader) with the color which specified via a
|
| GrBatch's GrPrimitiveProcesssor. Currently there is a bool param to indicate whether the
|
| @@ -72,16 +75,18 @@ bool SkPaintToGrPaintWithXfermode(GrContext* context,
|
| const SkMatrix& viewM,
|
| SkXfermode::Mode primColorMode,
|
| bool primitiveIsSrc,
|
| - GrPaint* grPaint);
|
| + GrPaint* grPaint,
|
| + GrRenderTarget*);
|
|
|
| /** This is used when there is a primitive color, but the shader should be ignored. Currently,
|
| the expectation is that the primitive color will be premultiplied, though it really should be
|
| unpremultiplied so that interpolation is done in unpremul space. The paint's alpha will be
|
| applied to the primitive color after interpolation. */
|
| inline bool SkPaintToGrPaintWithPrimitiveColor(GrContext* context, const SkPaint& skPaint,
|
| - GrPaint* grPaint) {
|
| + GrPaint* grPaint,
|
| + GrRenderTarget*rt) {
|
| return SkPaintToGrPaintWithXfermode(context, skPaint, SkMatrix::I(), SkXfermode::kDst_Mode,
|
| - false, grPaint);
|
| + false, grPaint, rt);
|
| }
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
|
|