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

Commit fd39aa14 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Fix TextureLayer test" into nyc-dev

parents a17893b0 243e85b2

libs/hwui/tests/common/TestUtils.cpp

+9 −6
Original line number Diff line number Diff line
@@ -42,17 +42,20 @@ SkColor TestUtils::interpolateColor(float fraction, SkColor start, SkColor end) 


sp<DeferredLayerUpdater> TestUtils::createTextureLayerUpdater(

        renderthread::RenderThread& renderThread, uint32_t width, uint32_t height,

        std::function<void(Matrix4*)> transformSetupCallback) {

        const SkMatrix& transform) {

    Layer* layer = LayerRenderer::createTextureLayer(renderThread.renderState());



    sp<DeferredLayerUpdater> layerUpdater = new DeferredLayerUpdater(layer);

    layerUpdater->setSize(width, height);

    layerUpdater->setTransform(&transform);



    // updateLayer so it's ready to draw

    bool isOpaque = true;

    bool forceFilter = true;

    GLenum renderTarget = GL_TEXTURE_EXTERNAL_OES;



    Layer* layer = LayerRenderer::createTextureLayer(renderThread.renderState());

    LayerRenderer::updateTextureLayer(layer, width, height, isOpaque, forceFilter,

    renderTarget, Matrix4::identity().data);

    transformSetupCallback(&(layer->getTransform()));



    sp<DeferredLayerUpdater> layerUpdater = new DeferredLayerUpdater(layer);

    return layerUpdater;

}

libs/hwui/tests/common/TestUtils.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public: 


    static sp<DeferredLayerUpdater> createTextureLayerUpdater(

            renderthread::RenderThread& renderThread, uint32_t width, uint32_t height,

            std::function<void(Matrix4*)> transformSetupCallback);

            const SkMatrix& transform);



    template<class CanvasType>

    static std::unique_ptr<DisplayList> createDisplayList(int width, int height,

libs/hwui/tests/unit/FrameBuilderTests.cpp

+1 −3
Original line number Diff line number Diff line
@@ -387,9 +387,7 @@ RENDERTHREAD_TEST(FrameBuilder, textureLayer) { 
    };



    auto layerUpdater = TestUtils::createTextureLayerUpdater(renderThread, 100, 100,

            [](Matrix4* transform) {

        transform->loadTranslate(5, 5, 0);

    });

            SkMatrix::MakeTrans(5, 5));



    auto node = TestUtils::createNode(0, 0, 200, 200,

            [&layerUpdater](RenderProperties& props, RecordingCanvas& canvas) {