DO NOT MERGE: ViewRoot/BBQ: Cleanup flushShadowQueue am: bda55e3262

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16174825

Change-Id: I31d2dd40f8f3732ee2320a56ad9e0f6ca039c414
This commit is contained in:
Robert Carr
2021-11-03 22:04:41 +00:00
committed by Automerger Merge Worker
3 changed files with 0 additions and 16 deletions

View File

@@ -4164,11 +4164,6 @@ public final class ViewRootImpl implements ViewParent,
}
});
});
} else if (reportNextDraw) {
// If we need to report next draw, wait for adapter to flush its shadow queue
// by processing previously queued buffers so that we can submit the
// transaction a timely manner.
mBlastBufferQueue.flushShadowQueue();
}
};
registerRtFrameCallback(frameDrawingCallback);

View File

@@ -112,11 +112,6 @@ static void nativeUpdate(JNIEnv* env, jclass clazz, jlong ptr, jlong surfaceCont
transaction);
}
static void nativeFlushShadowQueue(JNIEnv* env, jclass clazz, jlong ptr) {
sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr);
queue->flushShadowQueue();
}
static void nativeMergeWithNextTransaction(JNIEnv*, jclass clazz, jlong ptr, jlong transactionPtr,
jlong framenumber) {
sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr);
@@ -147,7 +142,6 @@ static const JNINativeMethod gMethods[] = {
{"nativeDestroy", "(J)V", (void*)nativeDestroy},
{"nativeSetNextTransaction", "(JJ)V", (void*)nativeSetNextTransaction},
{"nativeUpdate", "(JJJJIJ)V", (void*)nativeUpdate},
{"nativeFlushShadowQueue", "(J)V", (void*)nativeFlushShadowQueue},
{"nativeMergeWithNextTransaction", "(JJJ)V", (void*)nativeMergeWithNextTransaction},
{"nativeSetTransactionCompleteCallback",
"(JJLandroid/graphics/BLASTBufferQueue$TransactionCompleteCallback;)V",

View File

@@ -34,7 +34,6 @@ public final class BLASTBufferQueue {
private static native void nativeSetNextTransaction(long ptr, long transactionPtr);
private static native void nativeUpdate(long ptr, long surfaceControl, long width, long height,
int format, long transactionPtr);
private static native void nativeFlushShadowQueue(long ptr);
private static native void nativeMergeWithNextTransaction(long ptr, long transactionPtr,
long frameNumber);
private static native void nativeSetTransactionCompleteCallback(long ptr, long frameNumber,
@@ -124,10 +123,6 @@ public final class BLASTBufferQueue {
}
}
public void flushShadowQueue() {
nativeFlushShadowQueue(mNativeObject);
}
/**
* Merge the transaction passed in to the next transaction in BlastBufferQueue. The next
* transaction will be applied or merged when the next frame with specified frame number