commit 86e1aebad122c283c5d9c7278c9c339cb0491dcc
author Chong Zhang <chz@google.com> Tue Oct 22 15:49:46 2019 -0700
committer Chong Zhang <chz@google.com> Wed Oct 23 12:28:08 2019 -0700
tree c9511dc7c5d5e9fe195ab63525b7eb271008b99f
parent b38f2e25134f81d0304a2e3ca82cb96c9439d8b6

[RenderEngine] Fix test build for RenderEngine refactor

Fix build after refactor of creation flags.

BUG: 142331374
Test: build, flash and boot
Change-Id: I59c2858f8e35426e2eb08c91e8797efd738a3922

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

diff --git a/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp b/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp
index d910169..e2f2670 100644
--- a/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp
+++ b/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp
@@ -26,12 +26,11 @@
 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

diff --git a/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/RenderEngineVts.h b/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/RenderEngineVts.h
index 0ac5a22..b936cab 100644
--- a/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/RenderEngineVts.h
+++ b/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/RenderEngineVts.h
@@ -35,11 +35,14 @@
 
 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 @@
     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;