diff options
Diffstat (limited to 'src/pipe')
-rw-r--r-- | src/pipe/SkPipeCanvas.cpp | 17 | ||||
-rw-r--r-- | src/pipe/SkPipeCanvas.h | 6 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index e7b04ce146..43235c3e68 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -352,7 +352,7 @@ void SkPipeCanvas::onDrawArc(const SkRect& bounds, SkScalar startAngle, SkScalar } void SkPipeCanvas::onDrawAtlas(const SkImage* image, const SkRSXform xform[], const SkRect rect[], - const SkColor colors[], int count, SK_XFERMODE_MODE_PARAM mode, + const SkColor colors[], int count, SkBlendMode mode, const SkRect* cull, const SkPaint* paint) { unsigned extra = (unsigned)mode; SkASSERT(0 == (extra & ~kMode_DrawAtlasMask)); @@ -732,7 +732,7 @@ void SkPipeCanvas::onDrawRegion(const SkRegion& region, const SkPaint& paint) { void SkPipeCanvas::onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SK_XFERMODE_PARAM xmode, + const SkColor colors[], SkBlendMode bmode, const uint16_t indices[], int indexCount, const SkPaint& paint) { SkASSERT(vertexCount > 0); @@ -742,12 +742,6 @@ void SkPipeCanvas::onDrawVertices(VertexMode vmode, int vertexCount, extra |= vertexCount; } extra |= (unsigned)vmode << kVMode_DrawVerticesShift; - -#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM - SkBlendMode bmode = xmode ? xmode->blend() : SkBlendMode::kModulate; -#else - SkBlendMode bmode = xmode; -#endif extra |= (unsigned)bmode << kXMode_DrawVerticesShift; if (texs) { @@ -781,15 +775,10 @@ void SkPipeCanvas::onDrawVertices(VertexMode vmode, int vertexCount, } void SkPipeCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], - const SkPoint texCoords[4], SK_XFERMODE_PARAM xmode, + const SkPoint texCoords[4], SkBlendMode bmode, const SkPaint& paint) { SkPipeWriter writer(this); unsigned extra = 0; -#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM - SkBlendMode bmode = xmode ? xmode->blend() : SkBlendMode::kModulate; -#else - SkBlendMode bmode = xmode; -#endif SkASSERT(0 == ((int)bmode & ~kModeEnum_DrawPatchExtraMask)); extra = (unsigned)bmode; if (colors) { diff --git a/src/pipe/SkPipeCanvas.h b/src/pipe/SkPipeCanvas.h index 87a906fff4..508c2a1ba5 100644 --- a/src/pipe/SkPipeCanvas.h +++ b/src/pipe/SkPipeCanvas.h @@ -105,7 +105,7 @@ protected: void onDrawArc(const SkRect&, SkScalar startAngle, SkScalar sweepAngle, bool useCenter, const SkPaint&) override; void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], - int count, SK_XFERMODE_MODE_PARAM, const SkRect* cull, const SkPaint*) override; + int count, SkBlendMode, const SkRect* cull, const SkPaint*) override; void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) override; @@ -119,7 +119,7 @@ protected: void onDrawTextRSXform(const void* text, size_t byteLength, const SkRSXform xform[], const SkRect* cull, const SkPaint& paint) override; void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texCoords[4], - SK_XFERMODE_PARAM, const SkPaint&) override; + SkBlendMode, const SkPaint&) override; void onDrawPaint(const SkPaint&) override; void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; @@ -138,7 +138,7 @@ protected: const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SK_XFERMODE_PARAM, + const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&) override; |