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

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

Merge "Revert "Change override displayFrame to mBounds"" into tm-dev

parents 15e3ced1 50abed0b

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

+7 −2
Original line number Diff line number Diff line
@@ -416,7 +416,12 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer, 


    if (outputDependentState.overrideInfo.buffer != nullptr) {

        displayFrame = outputDependentState.overrideInfo.displayFrame;

        sourceCrop = displayFrame.toFloatRect();

        sourceCrop =

                FloatRect(0.f, 0.f,

                          static_cast<float>(outputDependentState.overrideInfo.buffer->getBuffer()

                                                     ->getWidth()),

                          static_cast<float>(outputDependentState.overrideInfo.buffer->getBuffer()

                                                     ->getHeight()));

    }



    ALOGV("Writing display frame [%d, %d, %d, %d]", displayFrame.left, displayFrame.top,
@@ -790,7 +795,7 @@ std::vector<LayerFE::LayerSettings> OutputLayer::getOverrideCompositionList() co 
    // framebuffer space of the override buffer to layer space.

    const ProjectionSpace& layerSpace = getOutput().getState().layerStackSpace;

    const ui::Transform transform = getState().overrideInfo.displaySpace.getTransform(layerSpace);

    const Rect boundaries = transform.transform(getState().overrideInfo.displaySpace.getContent());

    const Rect boundaries = transform.transform(getState().overrideInfo.displayFrame);



    LayerFE::LayerSettings settings;

    settings.geometry = renderengine::Geometry{

services/surfaceflinger/CompositionEngine/src/planner/Flattener.cpp

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers 
                        state.overrideInfo = {

                                .buffer = mNewCachedSet->getBuffer(),

                                .acquireFence = mNewCachedSet->getDrawFence(),

                                .displayFrame = mNewCachedSet->getBounds(),

                                .displayFrame = mNewCachedSet->getTextureBounds(),

                                .dataspace = mNewCachedSet->getOutputDataspace(),

                                .displaySpace = mNewCachedSet->getOutputSpace(),

                                .damageRegion = Region::INVALID_REGION,
@@ -356,7 +356,7 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers 
                state.overrideInfo = {

                        .buffer = currentLayerIter->getBuffer(),

                        .acquireFence = currentLayerIter->getDrawFence(),

                        .displayFrame = currentLayerIter->getBounds(),

                        .displayFrame = currentLayerIter->getTextureBounds(),

                        .dataspace = currentLayerIter->getOutputDataspace(),

                        .displaySpace = currentLayerIter->getOutputSpace(),

                        .damageRegion = Region(),

services/surfaceflinger/CompositionEngine/tests/OutputLayerTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ const half4 OutputLayerWriteStateToHWCTest::kColor{81.f / 255.f, 82.f / 255.f, 8 
                                                   84.f / 255.f};

const Rect OutputLayerWriteStateToHWCTest::kDisplayFrame{1001, 1002, 1003, 10044};

const Rect OutputLayerWriteStateToHWCTest::kOverrideDisplayFrame{1002, 1003, 1004, 20044};

const FloatRect OutputLayerWriteStateToHWCTest::kOverrideSourceCrop{1002, 1003, 1004, 20044};

const FloatRect OutputLayerWriteStateToHWCTest::kOverrideSourceCrop{0.f, 0.f, 4.f, 5.f};

const Region OutputLayerWriteStateToHWCTest::kOutputSpaceVisibleRegion{

        Rect{1005, 1006, 1007, 1008}};

const Region OutputLayerWriteStateToHWCTest::kOverrideVisibleRegion{Rect{1006, 1007, 1008, 1009}};