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

Merge "surface_control NDK: Track frameworks/native changes" into tm-qpr-dev

Browse Source
This commit is contained in:
Rob Carr
2022-09-30 17:04:29 +00:00
committed by Android (Google) Code Review
parent b81c7effc0 7c70373e25
commit 1d3ecebe6c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
native/android/surface_control.cpp
View File

@@ -300,7 +300,7 @@ void ASurfaceTransaction_setOnComplete(ASurfaceTransaction* aSurfaceTransaction,
auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats; auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats;
for (const auto& [surfaceControl, latchTime, acquireTimeOrFence, presentFence, for (const auto& [surfaceControl, latchTime, acquireTimeOrFence, presentFence,
previousReleaseFence, transformHint, frameEvents] : surfaceControlStats) { previousReleaseFence, transformHint, frameEvents, ignore] : surfaceControlStats) {
ASurfaceControl* aSurfaceControl = reinterpret_cast<ASurfaceControl*>(surfaceControl.get()); ASurfaceControl* aSurfaceControl = reinterpret_cast<ASurfaceControl*>(surfaceControl.get());
aSurfaceControlStats[aSurfaceControl].acquireTimeOrFence = acquireTimeOrFence; aSurfaceControlStats[aSurfaceControl].acquireTimeOrFence = acquireTimeOrFence;
aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence; aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence;
@@ -650,7 +650,7 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v
auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats; auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats;
for (const auto& [surfaceControl, latchTime, acquireTimeOrFence, presentFence, for (const auto& [surfaceControl, latchTime, acquireTimeOrFence, presentFence,
previousReleaseFence, transformHint, frameEvents] : previousReleaseFence, transformHint, frameEvents, ignore] :
surfaceControlStats) { surfaceControlStats) {
ASurfaceControl* aSurfaceControl = ASurfaceControl* aSurfaceControl =
reinterpret_cast<ASurfaceControl*>(surfaceControl.get()); reinterpret_cast<ASurfaceControl*>(surfaceControl.get());