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

Commit 5ef8f96e authored by Lloyd Pique's avatar Lloyd Pique Committed by Android (Google) Code Review
Browse files

Merge changes Id1e90796,Ic8fe0fee,I2ed83355 

* changes:
  SF: Move HWComposerBufferCache in to CompositionEngine
  SF: Intro CE::OutputLayer
  SF: Setup CompositionEngine::Layer
parents 7d46353c 76ed7030

services/surfaceflinger/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ filegroup { 
        "DisplayHardware/FramebufferSurface.cpp",

        "DisplayHardware/HWC2.cpp",

        "DisplayHardware/HWComposer.cpp",

        "DisplayHardware/HWComposerBufferCache.cpp",

        "DisplayHardware/PowerAdvisor.cpp",

        "DisplayHardware/VirtualDisplaySurface.cpp",

        "Effects/Daltonizer.cpp",

services/surfaceflinger/BufferLayer.cpp

+23 −17
Original line number Diff line number Diff line
@@ -19,40 +19,42 @@ 
#define LOG_TAG "BufferLayer"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include "BufferLayer.h"

#include "Colorizer.h"

#include "DisplayDevice.h"

#include "LayerRejecter.h"



#include "TimeStats/TimeStats.h"



#include <renderengine/RenderEngine.h>

#include <cmath>

#include <cstdlib>

#include <mutex>



#include <compositionengine/CompositionEngine.h>

#include <compositionengine/Layer.h>

#include <compositionengine/LayerCreationArgs.h>

#include <cutils/compiler.h>

#include <cutils/native_handle.h>

#include <cutils/properties.h>

#include <gui/BufferItem.h>

#include <gui/BufferQueue.h>

#include <gui/LayerDebugInfo.h>

#include <gui/Surface.h>



#include <renderengine/RenderEngine.h>

#include <ui/DebugUtils.h>



#include <utils/Errors.h>

#include <utils/Log.h>

#include <utils/NativeHandle.h>

#include <utils/StopWatch.h>

#include <utils/Trace.h>



#include <cutils/compiler.h>

#include <cutils/native_handle.h>

#include <cutils/properties.h>

#include "BufferLayer.h"

#include "Colorizer.h"

#include "DisplayDevice.h"

#include "LayerRejecter.h"



#include <math.h>

#include <stdlib.h>

#include <mutex>

#include "TimeStats/TimeStats.h"



namespace android {



BufferLayer::BufferLayer(const LayerCreationArgs& args)

      : Layer(args), mTextureName(args.flinger->getNewTexture()) {

      : Layer(args),

        mTextureName(args.flinger->getNewTexture()),

        mCompositionLayer{mFlinger->getCompositionEngine().createLayer(

                compositionengine::LayerCreationArgs{this})} {

    ALOGV("Creating Layer %s", args.name.string());



    mPremultipliedAlpha = !(args.flags & ISurfaceComposerClient::eNonPremultiplied);
@@ -649,6 +651,10 @@ Rect BufferLayer::getBufferSize(const State& s) const { 
    return Rect(bufWidth, bufHeight);

}



std::shared_ptr<compositionengine::Layer> BufferLayer::getCompositionLayer() const {

    return mCompositionLayer;

}



} // namespace android



#if defined(__gl_h_)

services/surfaceflinger/BufferLayer.h

+16 −15
Original line number Diff line number Diff line
@@ -16,35 +16,32 @@ 


#pragma once



#include "BufferLayerConsumer.h"

#include "Client.h"

#include "Layer.h"

#include "DisplayHardware/HWComposer.h"

#include "DisplayHardware/HWComposerBufferCache.h"

#include "FrameTracker.h"

#include "LayerVector.h"

#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"

#include <sys/types.h>

#include <cstdint>

#include <list>



#include <gui/ISurfaceComposerClient.h>

#include <gui/LayerState.h>

#include <renderengine/Image.h>

#include <renderengine/Mesh.h>

#include <renderengine/Texture.h>

#include <system/window.h> // For NATIVE_WINDOW_SCALING_MODE_FREEZE

#include <ui/FrameStats.h>

#include <ui/GraphicBuffer.h>

#include <ui/PixelFormat.h>

#include <ui/Region.h>



#include <utils/RefBase.h>

#include <utils/String8.h>

#include <utils/Timers.h>



#include <system/window.h> // For NATIVE_WINDOW_SCALING_MODE_FREEZE



#include <stdint.h>

#include <sys/types.h>

#include <list>

#include "BufferLayerConsumer.h"

#include "Client.h"

#include "DisplayHardware/HWComposer.h"

#include "FrameTracker.h"

#include "Layer.h"

#include "LayerVector.h"

#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"



namespace android {
@@ -57,6 +54,8 @@ public: 
    // Overriden from Layer

    // -----------------------------------------------------------------------

public:

    std::shared_ptr<compositionengine::Layer> getCompositionLayer() const override;



    // If we have received a new buffer this frame, we will pass its surface

    // damage down to hardware composer. Otherwise, we must send a region with

    // one empty rect.
@@ -187,6 +186,8 @@ private: 
    bool mBufferLatched{false}; // TODO: Use mActiveBuffer?



    Rect getBufferSize(const State& s) const override;



    std::shared_ptr<compositionengine::Layer> mCompositionLayer;

};



} // namespace android

services/surfaceflinger/ColorLayer.cpp

+11 −1
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include <stdlib.h>

#include <sys/types.h>



#include <compositionengine/CompositionEngine.h>

#include <compositionengine/Layer.h>

#include <compositionengine/LayerCreationArgs.h>

#include <renderengine/RenderEngine.h>

#include <ui/GraphicBuffer.h>

#include <utils/Errors.h>
@@ -34,7 +37,10 @@ 
namespace android {

// ---------------------------------------------------------------------------



ColorLayer::ColorLayer(const LayerCreationArgs& args) : Layer(args) {}

ColorLayer::ColorLayer(const LayerCreationArgs& args)

      : Layer(args),

        mCompositionLayer{mFlinger->getCompositionEngine().createLayer(

                compositionengine::LayerCreationArgs{this})} {}



ColorLayer::~ColorLayer() = default;
@@ -128,6 +134,10 @@ void ColorLayer::setPerFrameData(DisplayId displayId, const ui::Transform& trans 
    getBE().compositionInfo.hwc.surfaceDamage = surfaceDamageRegion;

}



std::shared_ptr<compositionengine::Layer> ColorLayer::getCompositionLayer() const {

    return mCompositionLayer;

}



// ---------------------------------------------------------------------------



}; // namespace android

services/surfaceflinger/ColorLayer.h

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ public: 
    explicit ColorLayer(const LayerCreationArgs&);

    ~ColorLayer() override;



    std::shared_ptr<compositionengine::Layer> getCompositionLayer() const override;



    virtual const char* getTypeId() const { return "ColorLayer"; }

    bool isVisible() const override;
@@ -43,6 +45,9 @@ protected: 
    virtual bool prepareClientLayer(const RenderArea& renderArea, const Region& clip,

                                    bool useIdentityTransform, Region& clearRegion,

                                    renderengine::LayerSettings& layer);



private:

    std::shared_ptr<compositionengine::Layer> mCompositionLayer;

};



} // namespace android