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

Commit 63bbbb4e authored by Pete Bentley's avatar Pete Bentley Committed by android-build-merger
Browse files

Merge "Revert "SurfaceFlinger: add a sysprop for GL backpressure"" into qt-dev am: de17b13a 

am: 65dc3005

Change-Id: If20d660de54c22de9bbd7cd1a0c7c6bb7fcc2d7f
parents e0aedc2e 65dc3005

services/surfaceflinger/SurfaceFlinger.cpp

+3 −8
Original line number Diff line number Diff line
@@ -358,11 +358,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
    mPropagateBackpressure = !atoi(value);

    ALOGI_IF(!mPropagateBackpressure, "Disabling backpressure propagation");



    property_get("debug.sf.enable_gl_backpressure", value, "0");

    mPropagateBackpressureClientComposition = atoi(value);

    ALOGI_IF(mPropagateBackpressureClientComposition,

             "Enabling backpressure propagation for Client Composition");



    property_get("debug.sf.enable_hwc_vds", value, "0");

    mUseHwcVirtualDisplays = atoi(value);

    ALOGI_IF(mUseHwcVirtualDisplays, "Enabling HWC virtual displays");
@@ -1742,9 +1737,9 @@ void SurfaceFlinger::onMessageReceived(int32_t what) NO_THREAD_SAFETY_ANALYSIS { 
                break;

            }



            if (frameMissed && mPropagateBackpressure) {

                if ((hwcFrameMissed && !gpuFrameMissed) ||

                    mPropagateBackpressureClientComposition) {

            // For now, only propagate backpressure when missing a hwc frame.

            if (hwcFrameMissed && !gpuFrameMissed) {

                if (mPropagateBackpressure) {

                    signalLayerUpdate();

                    break;

                }

services/surfaceflinger/SurfaceFlinger.h

+0 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,6 @@ private: 
    volatile nsecs_t mDebugInTransaction = 0;

    bool mForceFullDamage = false;

    bool mPropagateBackpressure = true;

    bool mPropagateBackpressureClientComposition = false;

    std::unique_ptr<SurfaceInterceptor> mInterceptor;

    SurfaceTracing mTracing{*this};

    bool mTracingEnabled = false;