Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "SyncRtSurfaceTransactionApplier: Use BLASTSync"" into sc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2021-01-30 00:15:49 +00:00
committed by Android (Google) Code Review
parent 5dd5b13ec3 de64ae1792
commit 87528b5f9e
4 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/SyncRtSurfaceTransactionApplier.java
View File

@@ -85,13 +85,12 @@ public class SyncRtSurfaceTransactionApplier {
for (int i = params.length - 1; i >= 0; i--) { for (int i = params.length - 1; i >= 0; i--) {
SurfaceParams surfaceParams = params[i]; SurfaceParams surfaceParams = params[i];
SurfaceControl surface = surfaceParams.surface; SurfaceControl surface = surfaceParams.surface;
if (frame > 0) {
t.deferTransactionUntil(surface, mTargetSc, frame);
}
applyParams(t, surfaceParams, mTmpFloat9); applyParams(t, surfaceParams, mTmpFloat9);
} }
if (mTargetViewRootImpl != null) { t.apply();
mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
} else {
t.apply();
}
} }
public static void applyParams(Transaction t, SurfaceParams params, float[] tmpFloat9) { public static void applyParams(Transaction t, SurfaceParams params, float[] tmpFloat9) {

2
core/java/android/view/ViewRootImpl.java
View File

@@ -10109,7 +10109,7 @@ public final class ViewRootImpl implements ViewParent,
* Merges the transaction passed in with the next transaction in BLASTBufferQueue. This ensures * Merges the transaction passed in with the next transaction in BLASTBufferQueue. This ensures
* you can add transactions to the upcoming frame. * you can add transactions to the upcoming frame.
*/ */
public void mergeWithNextTransaction(Transaction t, long frameNumber) { void mergeWithNextTransaction(Transaction t, long frameNumber) {
if (mBlastBufferQueue != null) { if (mBlastBufferQueue != null) {
mBlastBufferQueue.mergeWithNextTransaction(t, frameNumber); mBlastBufferQueue.mergeWithNextTransaction(t, frameNumber);
} }

7
packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java
View File

@@ -114,13 +114,10 @@ public class SyncRtSurfaceTransactionApplierCompat {
for (int i = params.length - 1; i >= 0; i--) { for (int i = params.length - 1; i >= 0; i--) {
SyncRtSurfaceTransactionApplierCompat.SurfaceParams surfaceParams = SyncRtSurfaceTransactionApplierCompat.SurfaceParams surfaceParams =
params[i]; params[i];
t.deferTransactionUntil(surfaceParams.surface, mBarrierSurfaceControl, frame);
surfaceParams.applyTo(t); surfaceParams.applyTo(t);
} }
if (mTargetViewRootImpl != null) { t.apply();
mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
} else {
t.apply();
}
Trace.traceEnd(Trace.TRACE_TAG_VIEW); Trace.traceEnd(Trace.TRACE_TAG_VIEW);
Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0) Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
.sendToTarget(); .sendToTarget();

8
packages/SystemUI/shared/src/com/android/systemui/shared/system/ViewRootImplCompat.java
View File

@@ -56,12 +56,4 @@ public class ViewRootImplCompat {
}); });
} }
} }
public void mergeWithNextTransaction(SurfaceControl.Transaction t, long frame) {
if (mViewRoot != null) {
mViewRoot.mergeWithNextTransaction(t, frame);
} else {
t.apply();
}
}
} }