diff options
| author | Pete Bentley <prb@google.com> | 2019-09-12 05:06:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-12 05:06:24 -0700 |
| commit | 63bbbb4ed7008f02d67782c6dae1bc91e62479db (patch) | |
| tree | 80378279c67c957dc4ad7d10e00c4b57118ea479 | |
| parent | e0aedc2e744cb983dd2a3373d8bd114a4e1061f3 (diff) | |
| parent | 65dc300533dc764168a0dc729b7f917edda22508 (diff) | |
| download | native-63bbbb4ed7008f02d67782c6dae1bc91e62479db.tar.gz | |
Merge "Revert "SurfaceFlinger: add a sysprop for GL backpressure"" into qt-dev am: de17b13a2f
am: 65dc300533
Change-Id: If20d660de54c22de9bbd7cd1a0c7c6bb7fcc2d7f
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 11 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index ffb7012bb3..d91b0e7db7 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -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; } diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index a59a1e0086..74882f3909 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -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; |