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

Commit 13d03d51 authored by mamik's avatar mamik Committed by Mike Ma
Browse files

Rev up vr_hwc to composer@2.3 

Fix for issue: "[GSI XR] VrFlinger doesn't work on GSI/MTP845.

Making member variables protected instead of private for the 2.3
interface, which is the behavior in the 2.1 interface.
"vr_composer_client" needs to access the "mResources" and "mHal" class
member to be able to create the ComposerCommandEngine.

Bug: 137325030
Bug: 138938154
Bug: 137448042

Test: Built the firmware and ran the dvr_display-test, which passes
now.

Change-Id: I0f531d4dd6d60a3f2da793f19b4d3ea1eb53930e
parent ac28485d

graphics/composer/2.3/utils/hal/include/composer-hal/2.3/ComposerClient.h

+4 −4
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ class ComposerClientImpl : public V2_2::hal::detail::ComposerClientImpl<Interfac 
    }



  protected:

    using BaseType2_1 = V2_1::hal::detail::ComposerClientImpl<Interface, Hal>;

    using BaseType2_1::mHal;

    using BaseType2_1::mResources;

    std::unique_ptr<V2_1::hal::ComposerCommandEngine> createCommandEngine() override {

        return std::make_unique<ComposerCommandEngine>(

            mHal, static_cast<V2_2::hal::ComposerResources*>(mResources.get()));
@@ -191,11 +194,8 @@ class ComposerClientImpl : public V2_2::hal::detail::ComposerClientImpl<Interfac 


  private:

    using BaseType2_2 = V2_2::hal::detail::ComposerClientImpl<Interface, Hal>;

    using BaseType2_1 = V2_1::hal::detail::ComposerClientImpl<Interface, Hal>;

    using BaseType2_1::mCommandEngine;

    using BaseType2_1::mCommandEngineMutex;

    using BaseType2_1::mHal;

    using BaseType2_1::mResources;

};



}  // namespace detail