Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40d59683 authored by Mike Reed's avatar Mike Reed Committed by Android (Google) Code Review
Browse files

Merge "move to new virtual for drawVertices"

parents ca960112 08606656

libs/hwui/RecordingCanvas.cpp

+6 −11
Original line number Diff line number Diff line
@@ -448,14 +448,13 @@ struct DrawPoints final : Op { 
};

struct DrawVertices final : Op {

    static const auto kType = Type::DrawVertices;

    DrawVertices(const SkVertices* v, int bc, SkBlendMode m, const SkPaint& p)

            : vertices(sk_ref_sp(const_cast<SkVertices*>(v))), boneCount(bc), mode(m), paint(p) {}

    DrawVertices(const SkVertices* v, SkBlendMode m, const SkPaint& p)

            : vertices(sk_ref_sp(const_cast<SkVertices*>(v))), mode(m), paint(p) {}

    sk_sp<SkVertices> vertices;

    int boneCount;

    SkBlendMode mode;

    SkPaint paint;

    void draw(SkCanvas* c, const SkMatrix&) const {

        c->drawVertices(vertices, pod<SkVertices::Bone>(this), boneCount, mode, paint);

        c->drawVertices(vertices, mode, paint);

    }

};

struct DrawAtlas final : Op {
@@ -686,11 +685,8 @@ void DisplayListData::drawPoints(SkCanvas::PointMode mode, size_t count, const S 
    void* pod = this->push<DrawPoints>(count * sizeof(SkPoint), mode, count, paint);

    copy_v(pod, points, count);

}

void DisplayListData::drawVertices(const SkVertices* vertices, const SkVertices::Bone bones[],

                                   int boneCount, SkBlendMode mode, const SkPaint& paint) {

    void* pod = this->push<DrawVertices>(boneCount * sizeof(SkVertices::Bone), vertices, boneCount,

                                         mode, paint);

    copy_v(pod, bones, boneCount);

void DisplayListData::drawVertices(const SkVertices* vertices, SkBlendMode mode, const SkPaint& paint) {

    this->push<DrawVertices>(0, vertices, mode, paint);

}

void DisplayListData::drawAtlas(const SkImage* atlas, const SkRSXform xforms[], const SkRect texs[],

                                const SkColor colors[], int count, SkBlendMode xfermode,
@@ -1007,9 +1003,8 @@ void RecordingCanvas::onDrawPoints(SkCanvas::PointMode mode, size_t count, const 
    fDL->drawPoints(mode, count, pts, paint);

}

void RecordingCanvas::onDrawVerticesObject(const SkVertices* vertices,

                                           const SkVertices::Bone bones[], int boneCount,

                                           SkBlendMode mode, const SkPaint& paint) {

    fDL->drawVertices(vertices, bones, boneCount, mode, paint);

    fDL->drawVertices(vertices, mode, paint);

}

void RecordingCanvas::onDrawAtlas(const SkImage* atlas, const SkRSXform xforms[],

                                  const SkRect texs[], const SkColor colors[], int count,

libs/hwui/RecordingCanvas.h

+2 −4
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ private: 
    void drawPatch(const SkPoint[12], const SkColor[4], const SkPoint[4], SkBlendMode,

                   const SkPaint&);

    void drawPoints(SkCanvas::PointMode, size_t, const SkPoint[], const SkPaint&);

    void drawVertices(const SkVertices*, const SkVertices::Bone bones[], int boneCount, SkBlendMode,

                      const SkPaint&);

    void drawVertices(const SkVertices*, SkBlendMode, const SkPaint&);

    void drawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,

                   SkBlendMode, const SkRect*, const SkPaint*);

    void drawShadowRec(const SkPath&, const SkDrawShadowRec&);
@@ -206,8 +205,7 @@ public: 
    void onDrawPatch(const SkPoint[12], const SkColor[4], const SkPoint[4], SkBlendMode,

                     const SkPaint&) override;

    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;

    void onDrawVerticesObject(const SkVertices*, const SkVertices::Bone bones[], int boneCount,

                              SkBlendMode, const SkPaint&) override;

    void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override;

    void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,

                     SkBlendMode, const SkRect*, const SkPaint*) override;

    void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override;