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

Commit a9102710 authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Actually use texture bounds in CachedSet::getTextureBounds" into sc-dev

parents 7b86b176 7c4913dc

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,9 @@ public: 
    size_t getLayerCount() const { return mLayers.size(); }

    size_t getLayerCount() const { return mLayers.size(); }

    const Layer& getFirstLayer() const { return mLayers[0]; }

    const Layer& getFirstLayer() const { return mLayers[0]; }

    const Rect& getBounds() const { return mBounds; }

    const Rect& getBounds() const { return mBounds; }

    Rect getTextureBounds() const { return mOutputSpace.content; }

    Rect getTextureBounds() const {

        return mTexture ? mTexture->get()->getBuffer()->getBounds() : Rect::INVALID_RECT;

    }

    const Region& getVisibleRegion() const { return mVisibleRegion; }

    const Region& getVisibleRegion() const { return mVisibleRegion; }

    size_t getAge() const { return mAge; }

    size_t getAge() const { return mAge; }

    std::shared_ptr<renderengine::ExternalTexture> getBuffer() const {

    std::shared_ptr<renderengine::ExternalTexture> getBuffer() const {

services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -355,7 +355,7 @@ TEST_F(CachedSetTest, render) { 
    expectReadyBuffer(cachedSet);

    expectReadyBuffer(cachedSet);





    EXPECT_EQ(mOutputState.framebufferSpace, cachedSet.getOutputSpace());

    EXPECT_EQ(mOutputState.framebufferSpace, cachedSet.getOutputSpace());

    EXPECT_EQ(mOutputState.framebufferSpace.content, cachedSet.getTextureBounds());

    EXPECT_EQ(Rect(kOutputSize.width, kOutputSize.height), cachedSet.getTextureBounds());





    // Now check that appending a new cached set properly cleans up RenderEngine resources.

    // Now check that appending a new cached set properly cleans up RenderEngine resources.

    CachedSet::Layer& layer3 = *mTestLayers[2]->cachedSetLayer.get();

    CachedSet::Layer& layer3 = *mTestLayers[2]->cachedSetLayer.get();