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

Commit 6cd3294c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Use consistent names for display references"

parents 2fe2a082 eecd6597

services/surfaceflinger/BufferLayer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -606,13 +606,13 @@ void BufferLayer::setDefaultBufferSize(uint32_t w, uint32_t h) { 
    mConsumer->setDefaultBufferSize(w, h);

}



void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) {

void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& display) {

    // Apply this display's projection's viewport to the visible region

    // before giving it to the HWC HAL.

    const Transform& tr = displayDevice->getTransform();

    const auto& viewport = displayDevice->getViewport();

    const Transform& tr = display->getTransform();

    const auto& viewport = display->getViewport();

    Region visible = tr.transform(visibleRegion.intersect(viewport));

    auto hwcId = displayDevice->getHwcDisplayId();

    auto hwcId = display->getHwcDisplayId();

    auto& hwcInfo = getBE().mHwcLayers[hwcId];

    auto& hwcLayer = hwcInfo.layer;

    auto error = hwcLayer->setVisibleRegion(visible);
@@ -659,7 +659,7 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) 
    }



    const HdrMetadata& metadata = mConsumer->getCurrentHdrMetadata();

    error = hwcLayer->setPerFrameMetadata(displayDevice->getSupportedPerFrameMetadata(), metadata);

    error = hwcLayer->setPerFrameMetadata(display->getSupportedPerFrameMetadata(), metadata);

    if (error != HWC2::Error::None && error != HWC2::Error::Unsupported) {

        ALOGE("[%s] Failed to set hdrMetadata: %s (%d)", mName.string(),

              to_string(error).c_str(), static_cast<int32_t>(error));

services/surfaceflinger/BufferLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public: 
    bool isBufferLatched() const override { return mRefreshPending; }

    void setDefaultBufferSize(uint32_t w, uint32_t h) override;



    void setPerFrameData(const sp<const DisplayDevice>& displayDevice) override;

    void setPerFrameData(const sp<const DisplayDevice>& display) override;



    bool isOpaque(const Layer::State& s) const override;

services/surfaceflinger/ColorLayer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ bool ColorLayer::isVisible() const { 
    return !isHiddenByPolicy() && s.color.a;

}



void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice) {

    const Transform& tr = displayDevice->getTransform();

    const auto& viewport = displayDevice->getViewport();

void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& display) {

    const Transform& tr = display->getTransform();

    const auto& viewport = display->getViewport();

    Region visible = tr.transform(visibleRegion.intersect(viewport));

    auto hwcId = displayDevice->getHwcDisplayId();

    auto hwcId = display->getHwcDisplayId();

    auto& hwcInfo = getBE().mHwcLayers[hwcId];

    auto& hwcLayer = hwcInfo.layer;

    auto error = hwcLayer->setVisibleRegion(visible);

services/surfaceflinger/ColorLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public: 
                        bool useIdentityTransform) const;

    bool isVisible() const override;



    void setPerFrameData(const sp<const DisplayDevice>& displayDevice) override;

    void setPerFrameData(const sp<const DisplayDevice>& display) override;

};



} // namespace android

services/surfaceflinger/ContainerLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public: 
                bool useIdentityTransform) const override;

    bool isVisible() const override;



    void setPerFrameData(const sp<const DisplayDevice>& displayDevice) override;

    void setPerFrameData(const sp<const DisplayDevice>& display) override;

};



} // namespace android