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

Commit e9d092a9 authored by silence_dogood's avatar silence_dogood
Browse files

Cache NATIVE_WINDOW_MAX_BUFFER_COUNT in Surface 

To avoid the sync binder call to BufferQueue everytime
vkGetPhysicalDeviceSurfaceCapabilitiesKHR and
GetPhysicalDeviceSurfacePresentModesKHR are called, we cache the
NATIVE_WINDOW_MAX_BUFFER_COUNT at the Surface each time the client
connects.

Bug: 133187007
Test: dEQP-VK.wsi.android.surface#query_present_modes,
libgui_test:BufferQueueTest#GetMaxBufferCountInQueueBufferOutput_Succeeds

Change-Id: I7c1a0e99d73151cd451a2f3cb173f843efd57ce1
parent 29d4e9ce

libs/gui/BufferQueueProducer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -1132,9 +1132,6 @@ int BufferQueueProducer::query(int what, int *outValue) { 
        case NATIVE_WINDOW_CONSUMER_IS_PROTECTED:

            value = static_cast<int32_t>(mCore->mConsumerIsProtected);

            break;

        case NATIVE_WINDOW_MAX_BUFFER_COUNT:

            value = static_cast<int32_t>(mCore->mMaxBufferCount);

            break;

        default:

            return BAD_VALUE;

    }
@@ -1199,6 +1196,7 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener, 
                    static_cast<uint32_t>(mCore->mQueue.size());

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

            output->bufferReplaced = false;

            output->maxBufferCount = mCore->mMaxBufferCount;



            if (listener != nullptr) {

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

libs/gui/IGraphicBufferProducer.cpp

+4 −6
Original line number Diff line number Diff line
@@ -1141,12 +1141,8 @@ status_t IGraphicBufferProducer::QueueBufferInput::unflatten( 


// ----------------------------------------------------------------------------

constexpr size_t IGraphicBufferProducer::QueueBufferOutput::minFlattenedSize() {

    return sizeof(width) +

            sizeof(height) +

            sizeof(transformHint) +

            sizeof(numPendingBuffers) +

            sizeof(nextFrameNumber) +

            sizeof(bufferReplaced);

    return sizeof(width) + sizeof(height) + sizeof(transformHint) + sizeof(numPendingBuffers) +

            sizeof(nextFrameNumber) + sizeof(bufferReplaced) + sizeof(maxBufferCount);

}



size_t IGraphicBufferProducer::QueueBufferOutput::getFlattenedSize() const {
@@ -1170,6 +1166,7 @@ status_t IGraphicBufferProducer::QueueBufferOutput::flatten( 
    FlattenableUtils::write(buffer, size, numPendingBuffers);

    FlattenableUtils::write(buffer, size, nextFrameNumber);

    FlattenableUtils::write(buffer, size, bufferReplaced);

    FlattenableUtils::write(buffer, size, maxBufferCount);



    return frameTimestamps.flatten(buffer, size, fds, count);

}
@@ -1187,6 +1184,7 @@ status_t IGraphicBufferProducer::QueueBufferOutput::unflatten( 
    FlattenableUtils::read(buffer, size, numPendingBuffers);

    FlattenableUtils::read(buffer, size, nextFrameNumber);

    FlattenableUtils::read(buffer, size, bufferReplaced);

    FlattenableUtils::read(buffer, size, maxBufferCount);



    return frameTimestamps.unflatten(buffer, size, fds, count);

}

libs/gui/Surface.cpp

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

    mProducerControlledByApp = controlledByApp;

    mSwapIntervalZero = false;

    mMaxBufferCount = 0;

}



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

                return NO_ERROR;

            }

            case NATIVE_WINDOW_MAX_BUFFER_COUNT: {

                *value = mMaxBufferCount;

                return NO_ERROR;

            }

        }

    }

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

        mDefaultHeight = output.height;

        mNextFrameNumber = output.nextFrameNumber;

        mMaxBufferCount = output.maxBufferCount;



        // 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

libs/gui/include/gui/IGraphicBufferProducer.h

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

        FrameEventHistoryDelta frameTimestamps;

        bool bufferReplaced{false};

        int maxBufferCount{0};

    };



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

libs/gui/include/gui/Surface.h

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


    bool mReportRemovedBuffers = false;

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

    int mMaxBufferCount;

};



} // namespace android