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

Commit d15d2d2e authored by Chia-I Wu's avatar Chia-I Wu
Browse files

fakehwc, libvr_hwc-hal: ComposerBase is moved 

ComposerBase is moved to another library and is renamed to
ComposerHal.

Test: builds
Change-Id: Ie9159b9d83558587d75aa6d0ad89a1848a281d01
parent 2ea25d07

services/surfaceflinger/tests/fakehwc/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ cc_test { 
    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.1-hal",

        "libsurfaceflinger_headers",

    ],

}

services/surfaceflinger/tests/fakehwc/FakeComposerClient.h

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <chrono>



using namespace android::hardware::graphics::composer::V2_1;

using namespace android::hardware::graphics::composer::V2_1::hal;

using namespace android::hardware::graphics::composer::V2_1::implementation;

using namespace android::hardware;

using namespace std::chrono_literals;
@@ -54,7 +55,7 @@ namespace sftest { 
constexpr Display PRIMARY_DISPLAY = static_cast<Display>(HWC_DISPLAY_PRIMARY);

constexpr Display EXTERNAL_DISPLAY = static_cast<Display>(HWC_DISPLAY_EXTERNAL);



class FakeComposerClient : public ComposerBase {

class FakeComposerClient : public ComposerHal {

public:

    FakeComposerClient();

    virtual ~FakeComposerClient();

services/vr/hardware_composer/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ cc_library_shared { 


  header_libs: [

    "android.hardware.graphics.composer@2.1-command-buffer",

    "android.hardware.graphics.composer@2.1-hal",

  ],



  export_header_lib_headers: [

    "android.hardware.graphics.composer@2.1-hal",

  ],



  export_static_lib_headers: [

services/vr/hardware_composer/impl/vr_hwc.h

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <android-base/unique_fd.h>

#include <android/frameworks/vr/composer/1.0/IVrComposerClient.h>

#include <android/hardware/graphics/composer/2.1/IComposer.h>

#include <ComposerBase.h>

#include <composer-hal/2.1/ComposerHal.h>

#include <ui/Fence.h>

#include <ui/GraphicBuffer.h>

#include <utils/StrongPointer.h>
@@ -46,7 +46,7 @@ namespace dvr { 
class VrComposerClient;



using android::hardware::graphics::common::V1_0::PixelFormat;

using android::hardware::graphics::composer::V2_1::implementation::ComposerBase;

using android::hardware::graphics::composer::V2_1::hal::ComposerHal;



class ComposerView {

 public:
@@ -191,7 +191,7 @@ class HwcDisplay { 
  void operator=(const HwcDisplay&) = delete;

};



class VrHwc : public IComposer, public ComposerBase, public ComposerView {

class VrHwc : public IComposer, public ComposerHal, public ComposerView {

 public:

  VrHwc();

  ~VrHwc() override;
@@ -204,7 +204,7 @@ class VrHwc : public IComposer, public ComposerBase, public ComposerView { 
      Display display, Layer layer,

      const IVrComposerClient::BufferMetadata& metadata);



  // ComposerBase

  // ComposerHal

  bool hasCapability(hwc2_capability_t capability) override;



  void removeClient() override;