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

Merge "Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-09-02 17:44:13 +00:00
committed by Android (Google) Code Review
parent 571b44289b b53c60876a
commit 2a8df9925b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -633,6 +633,9 @@ void CanvasContext::prepareAndDraw(RenderNode* node) {
prepareTree(info, frameInfo, systemTime(CLOCK_MONOTONIC), node); prepareTree(info, frameInfo, systemTime(CLOCK_MONOTONIC), node);
if (info.out.canDrawThisFrame) { if (info.out.canDrawThisFrame) {
draw(); draw();
} else {
// wait on fences so tasks don't overlap next frame
waitOnFences();
} }
} }

4
libs/hwui/renderthread/CanvasContext.h
View File

@@ -168,6 +168,8 @@ public:
ANDROID_API int64_t getFrameNumber(); ANDROID_API int64_t getFrameNumber();
void waitOnFences();
private: private:
friend class RegisterFrameCallbackTask; friend class RegisterFrameCallbackTask;
// TODO: Replace with something better for layer & other GL object // TODO: Replace with something better for layer & other GL object
@@ -178,8 +180,6 @@ private:
void freePrefetchedLayers(TreeObserver* observer); void freePrefetchedLayers(TreeObserver* observer);
void waitOnFences();
bool isSwapChainStuffed(); bool isSwapChainStuffed();
EGLint mLastFrameWidth = 0; EGLint mLastFrameWidth = 0;

3
libs/hwui/renderthread/DrawFrameTask.cpp
View File

@@ -104,6 +104,9 @@ void DrawFrameTask::run() {
if (CC_LIKELY(canDrawThisFrame)) { if (CC_LIKELY(canDrawThisFrame)) {
context->draw(); context->draw();
} else {
// wait on fences so tasks don't overlap next frame
context->waitOnFences();
} }
if (!canUnblockUiThread) { if (!canUnblockUiThread) {