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

Commit b2b26909 authored by silence_dogood's avatar silence_dogood
Browse files

Revert "Cache NATIVE_WINDOW_MAX_BUFFER_COUNT in Surface" 

This reverts commit 12536a8f.

Bug: 135538872
Bug: 133187007
Test: dEQP-VK.wsi.android.surface#query_present_modes
parent 12536a8f

libs/gui/BufferQueueProducer.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -1199,7 +1199,6 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener, 
                    static_cast<uint32_t>(mCore->mQueue.size());

                    static_cast<uint32_t>(mCore->mQueue.size());

            output->nextFrameNumber = mCore->mFrameCounter + 1;

            output->nextFrameNumber = mCore->mFrameCounter + 1;

            output->bufferReplaced = false;

            output->bufferReplaced = false;

            output->maxBufferCount = mCore->mMaxBufferCount;





            if (listener != nullptr) {

            if (listener != nullptr) {

                // Set up a death notification so that we can disconnect

                // Set up a death notification so that we can disconnect

libs/gui/Surface.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll 
    mConnectedToCpu = false;

    mConnectedToCpu = false;

    mProducerControlledByApp = controlledByApp;

    mProducerControlledByApp = controlledByApp;

    mSwapIntervalZero = false;

    mSwapIntervalZero = false;

    mMaxBufferCount = 0;

}

}





Surface::~Surface() {

Surface::~Surface() {
@@ -962,10 +961,6 @@ int Surface::query(int what, int* value) const { 
                *value = static_cast<int>(mDataSpace);

                *value = static_cast<int>(mDataSpace);

                return NO_ERROR;

                return NO_ERROR;

            }

            }

            case NATIVE_WINDOW_MAX_BUFFER_COUNT: {

                *value = mMaxBufferCount;

                return NO_ERROR;

            }

        }

        }

    }

    }

    return mGraphicBufferProducer->query(what, value);

    return mGraphicBufferProducer->query(what, value);
@@ -1303,7 +1298,6 @@ int Surface::connect( 
        mDefaultWidth = output.width;

        mDefaultWidth = output.width;

        mDefaultHeight = output.height;

        mDefaultHeight = output.height;

        mNextFrameNumber = output.nextFrameNumber;

        mNextFrameNumber = output.nextFrameNumber;

        mMaxBufferCount = output.maxBufferCount;





        // Ignore transform hint if sticky transform is set or transform to display inverse flag is

        // Ignore transform hint if sticky transform is set or transform to display inverse flag is

        // set. Transform hint should be ignored if the client is expected to always submit buffers

        // set. Transform hint should be ignored if the client is expected to always submit buffers

libs/gui/include/gui/IGraphicBufferProducer.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,6 @@ public: 
        uint64_t nextFrameNumber{0};

        uint64_t nextFrameNumber{0};

        FrameEventHistoryDelta frameTimestamps;

        FrameEventHistoryDelta frameTimestamps;

        bool bufferReplaced{false};

        bool bufferReplaced{false};

        int maxBufferCount{0};

    };

    };





    virtual status_t queueBuffer(int slot, const QueueBufferInput& input,

    virtual status_t queueBuffer(int slot, const QueueBufferInput& input,

libs/gui/include/gui/Surface.h

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




    bool mReportRemovedBuffers = false;

    bool mReportRemovedBuffers = false;

    std::vector<sp<GraphicBuffer>> mRemovedBuffers;

    std::vector<sp<GraphicBuffer>> mRemovedBuffers;

    int mMaxBufferCount;

};

};





} // namespace android

} // namespace android