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

Commit aa0e7d66 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[RenderEngine] Fix test build for RenderEngine refactor"

parents e3045d45 86e1aeba

graphics/composer/2.2/utils/vts/RenderEngineVts.cpp

+4 −5
Original line number Diff line number Diff line
@@ -26,12 +26,11 @@ namespace vts { 
using mapper::V2_1::IMapper;

using renderengine::DisplaySettings;

using renderengine::LayerSettings;

using renderengine::RenderEngineCreationArgs;



TestRenderEngine::TestRenderEngine(common::V1_1::PixelFormat hwcFormat,

                                   uint32_t renderEngineFeatures) {

    mFormat = hwcFormat;

    mRenderEngine = renderengine::RenderEngine::create(

            static_cast<int32_t>(mFormat), renderEngineFeatures, mMaxFrameBufferAcquireBuffers);

TestRenderEngine::TestRenderEngine(const RenderEngineCreationArgs& args) {

    mFormat = static_cast<common::V1_1::PixelFormat>(args.pixelFormat);

    mRenderEngine = renderengine::RenderEngine::create(args);

}



void TestRenderEngine::setRenderLayers(std::vector<std::shared_ptr<TestLayer>> layers) {

graphics/composer/2.2/utils/vts/include/composer-vts/2.2/RenderEngineVts.h

+4 −2
Original line number Diff line number Diff line
@@ -35,11 +35,14 @@ namespace vts { 


using mapper::V2_1::IMapper;

using renderengine::DisplaySettings;

using renderengine::RenderEngineCreationArgs;

using vts::Gralloc;



class TestRenderEngine {

  public:

    TestRenderEngine(common::V1_1::PixelFormat hwcFormat, uint32_t renderEngineFeatures);

    static constexpr uint32_t sMaxFrameBufferAcquireBuffers = 2;



    TestRenderEngine(const RenderEngineCreationArgs& args);

    ~TestRenderEngine() = default;



    void setRenderLayers(std::vector<std::shared_ptr<TestLayer>> layers);
@@ -51,7 +54,6 @@ class TestRenderEngine { 
    void checkColorBuffer(std::vector<V2_2::IComposerClient::Color>& expectedColors);



  private:

    static constexpr uint32_t mMaxFrameBufferAcquireBuffers = 2;

    common::V1_1::PixelFormat mFormat;

    std::vector<renderengine::LayerSettings> mCompositionLayers;

    std::unique_ptr<renderengine::RenderEngine> mRenderEngine;

graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp

+8 −3
Original line number Diff line number Diff line
@@ -103,9 +103,14 @@ class GraphicsCompositionTest : public ::testing::VtsHalHidlTargetTestBase { 


        ASSERT_NO_FATAL_FAILURE(

                mTestRenderEngine = std::unique_ptr<TestRenderEngine>(new TestRenderEngine(

                        PixelFormat::RGBA_8888,

                        renderengine::RenderEngine::USE_COLOR_MANAGEMENT |

                                renderengine::RenderEngine::USE_HIGH_PRIORITY_CONTEXT)));

                        renderengine::RenderEngineCreationArgs::Builder()

                            .setPixelFormat(static_cast<int>(ui::PixelFormat::RGBA_8888))

                            .setImageCacheSize(TestRenderEngine::sMaxFrameBufferAcquireBuffers)

                            .setUseColorManagerment(true)

                            .setEnableProtectedContext(false)

                            .setPrecacheToneMapperShaderOnly(false)

                            .setContextPriority(renderengine::RenderEngine::ContextPriority::HIGH)

                            .build())));



        renderengine::DisplaySettings clientCompositionDisplay;

        clientCompositionDisplay.physicalDisplay = Rect(mDisplayWidth, mDisplayHeight);