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

Commit 4f901c8c authored by Stan Iliev's avatar Stan Iliev
Browse files

Invoke create_recording_canvas correctly in macro bench tests 

create_recording_canvas expects as a last parameter a render node,
which is used to reuse deallocated display lists. Passing the
render node improved performance in several tests and it is
matching how HWUI is using that API too.

bug: 69131471
Test: tvappGlTex DrawFrame is 1ms faster
Change-Id: I93d8da694c178d3fb8d1aa52afa76dd8271e93cb
parent 331a22e3

libs/hwui/tests/common/TestListViewSceneBase.cpp

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ void TestListViewSceneBase::doFrame(int frameNr) { 
    int pxOffset = -(scrollPx % (mItemSpacing + mItemHeight));



    std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(

            mListView->stagingProperties().getWidth(), mListView->stagingProperties().getHeight()));

            mListView->stagingProperties().getWidth(), mListView->stagingProperties().getHeight(),

            mListView.get()));

    for (size_t ci = 0; ci < mListItems.size(); ci++) {

        // update item position

        auto listItem = mListItems[(ci + itemIndexOffset) % mListItems.size()];

libs/hwui/tests/common/TestUtils.h

+2 −1
Original line number Diff line number Diff line
@@ -250,7 +250,8 @@ public: 


    static void recordNode(RenderNode& node, std::function<void(Canvas&)> contentCallback) {

        std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(

                node.stagingProperties().getWidth(), node.stagingProperties().getHeight()));

                node.stagingProperties().getWidth(), node.stagingProperties().getHeight(),

                &node));

        contentCallback(*canvas.get());

        node.setStagingDisplayList(canvas->finishRecording());

    }

libs/hwui/tests/common/scenes/GlyphStressAnimation.cpp

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ public: 


        std::unique_ptr<Canvas> canvas(

                Canvas::create_recording_canvas(container->stagingProperties().getWidth(),

                                                container->stagingProperties().getHeight()));

                                                container->stagingProperties().getHeight(),

                                                container.get()));



        Paint paint;

        paint.setAntiAlias(true);

libs/hwui/tests/common/scenes/TvApp.cpp

+6 −3
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ private: 


        // re-recording card's canvas, not necessary but to add some burden to CPU

        std::unique_ptr<Canvas> cardcanvas(Canvas::create_recording_canvas(

                card->stagingProperties().getWidth(), card->stagingProperties().getHeight()));

                card->stagingProperties().getWidth(), card->stagingProperties().getHeight(),

                card.get()));

        sp<RenderNode> image = mImages[ci];

        sp<RenderNode> infoArea = mInfoAreas[ci];

        cardcanvas->drawRenderNode(infoArea.get());
@@ -205,14 +206,16 @@ private: 
            sp<RenderNode> overlay = mOverlays[ci];

            std::unique_ptr<Canvas> canvas(

                    Canvas::create_recording_canvas(overlay->stagingProperties().getWidth(),

                                                    overlay->stagingProperties().getHeight()));

                                                    overlay->stagingProperties().getHeight(),

                                                    overlay.get()));

            canvas->drawColor((curFrame % 150) << 24, SkBlendMode::kSrcOver);

            overlay->setStagingDisplayList(canvas->finishRecording());

            cardcanvas->drawRenderNode(overlay.get());

        } else {

            // re-recording image node's canvas, animating ColorFilter

            std::unique_ptr<Canvas> canvas(Canvas::create_recording_canvas(

                    image->stagingProperties().getWidth(), image->stagingProperties().getHeight()));

                    image->stagingProperties().getWidth(), image->stagingProperties().getHeight(),

                    image.get()));

            SkPaint paint;

            sk_sp<SkColorFilter> filter(

                    SkColorFilter::MakeModeFilter((curFrame % 150) << 24, SkBlendMode::kSrcATop));