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

Commit 0471bdec authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "graphics: sideband streams are not buffers" into oc-dr1-dev 

am: 9071cc5b

Change-Id: Ide31e01a39a4fef9bad680ff070fbf894ac7abc2
parents 42e8b6e0 9071cc5b

graphics/composer/2.1/default/ComposerClient.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,13 @@ Error ComposerClient::CommandReader::lookupBuffer(BufferCache cache, 


        // input handle is ignored

        *outHandle = entry->getHandle();

    } else if (cache == BufferCache::LAYER_SIDEBAND_STREAMS) {

        if (handle) {

            *outHandle = native_handle_clone(handle);

            if (*outHandle == nullptr) {

                return Error::NO_RESOURCES;

            }

        }

    } else {

        if (!sHandleImporter.importBuffer(handle)) {

            return Error::NO_RESOURCES;

graphics/composer/2.1/default/ComposerClient.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ public: 
protected:

    struct LayerBuffers {

        std::vector<BufferCacheEntry> Buffers;

        // the handle is a sideband stream handle, not a buffer handle

        BufferCacheEntry SidebandStream;

    };