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

Commit 6b62bfb8 authored by Mike Ma's avatar Mike Ma Committed by Android (Google) Code Review
Browse files

Merge "Rev up vr_hwc to composer@2.3"

parents b1b80dc9 13d03d51

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