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

Merge "DO NOT MERGE: ViewRoot/BBQ: Cleanup flushShadowQueue" into sc-v2-dev

Browse Source
This commit is contained in:
Rob Carr
2021-11-03 21:51:50 +00:00
committed by Android (Google) Code Review
parent 62924f1213 bda55e3262
commit bec1fdfcd0
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ViewRootImpl.java
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); registerRtFrameCallback(frameDrawingCallback);

6
core/jni/android_graphics_BLASTBufferQueue.cpp
View File

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

5
graphics/java/android/graphics/BLASTBufferQueue.java
View File

@@ -34,7 +34,6 @@ public final class BLASTBufferQueue {
private static native void nativeSetNextTransaction(long ptr, long transactionPtr); private static native void nativeSetNextTransaction(long ptr, long transactionPtr);
private static native void nativeUpdate(long ptr, long surfaceControl, long width, long height, private static native void nativeUpdate(long ptr, long surfaceControl, long width, long height,
int format, long transactionPtr); int format, long transactionPtr);
private static native void nativeFlushShadowQueue(long ptr);
private static native void nativeMergeWithNextTransaction(long ptr, long transactionPtr, private static native void nativeMergeWithNextTransaction(long ptr, long transactionPtr,
long frameNumber); long frameNumber);
private static native void nativeSetTransactionCompleteCallback(long ptr, 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 * 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 * transaction will be applied or merged when the next frame with specified frame number