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

am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev

Browse Source 
* commit 'ca93f69c96df85bd6bc72a2a47dae6c0d5336ab2':
  Have an actual fallback if the surface is lost
This commit is contained in:
John Reck
2014-11-07 22:45:33 +00:00
committed by Android Git Automerger
parent 8c1cd7e61f ca93f69c96
commit 8dda03a086
5 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/ThreadedRenderer.java
View File

@@ -66,6 +66,8 @@ public class ThreadedRenderer extends HardwareRenderer {
private static final int SYNC_OK = 0; private static final int SYNC_OK = 0;
// Needs a ViewRoot invalidate // Needs a ViewRoot invalidate
private static final int SYNC_INVALIDATE_REQUIRED = 1 << 0; private static final int SYNC_INVALIDATE_REQUIRED = 1 << 0;
// Spoiler: the reward is GPU-accelerated drawing, better find that Surface!
private static final int SYNC_LOST_SURFACE_REWARD_IF_FOUND = 1 << 1;
private static final String[] VISUALIZERS = { private static final String[] VISUALIZERS = {
PROFILE_PROPERTY_VISUALIZE_BARS, PROFILE_PROPERTY_VISUALIZE_BARS,
@@ -336,6 +338,12 @@ public class ThreadedRenderer extends HardwareRenderer {
int syncResult = nSyncAndDrawFrame(mNativeProxy, frameTimeNanos, int syncResult = nSyncAndDrawFrame(mNativeProxy, frameTimeNanos,
recordDuration, view.getResources().getDisplayMetrics().density); recordDuration, view.getResources().getDisplayMetrics().density);
if ((syncResult & SYNC_LOST_SURFACE_REWARD_IF_FOUND) != 0) {
setEnabled(false);
// Invalidate since we failed to draw. This should fetch a Surface
// if it is still needed or do nothing if we are no longer drawing
attachInfo.mViewRootImpl.invalidate();
}
if ((syncResult & SYNC_INVALIDATE_REQUIRED) != 0) { if ((syncResult & SYNC_INVALIDATE_REQUIRED) != 0) {
attachInfo.mViewRootImpl.invalidate(); attachInfo.mViewRootImpl.invalidate();
} }

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

@@ -166,6 +166,11 @@ void CanvasContext::prepareTree(TreeInfo& info) {
freePrefetechedLayers(); freePrefetechedLayers();
} }
if (CC_UNLIKELY(!mNativeWindow.get())) {
info.out.canDrawThisFrame = false;
return;
}
int runningBehind = 0; int runningBehind = 0;
// TODO: This query is moderately expensive, investigate adding some sort // TODO: This query is moderately expensive, investigate adding some sort
// of fast-path based off when we last called eglSwapBuffers() as well as // of fast-path based off when we last called eglSwapBuffers() as well as

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

@@ -68,6 +68,8 @@ public:
bool initialize(ANativeWindow* window); bool initialize(ANativeWindow* window);
void updateSurface(ANativeWindow* window); void updateSurface(ANativeWindow* window);
void pauseSurface(ANativeWindow* window); void pauseSurface(ANativeWindow* window);
bool hasSurface() { return mNativeWindow.get(); }
void setup(int width, int height, const Vector3& lightCenter, float lightRadius, void setup(int width, int height, const Vector3& lightCenter, float lightRadius,
uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha); uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha);
void setOpaque(bool opaque); void setOpaque(bool opaque);

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

@@ -132,6 +132,12 @@ bool DrawFrameTask::syncFrameState(TreeInfo& info) {
mLayers.clear(); mLayers.clear();
mContext->prepareTree(info); mContext->prepareTree(info);
// This is after the prepareTree so that any pending operations
// (RenderNode tree state, prefetched layers, etc...) will be flushed.
if (CC_UNLIKELY(!mContext->hasSurface())) {
mSyncResult |= kSync_LostSurfaceRewardIfFound;
}
if (info.out.hasAnimations) { if (info.out.hasAnimations) {
if (info.out.requiresUiRedraw) { if (info.out.requiresUiRedraw) {
mSyncResult |= kSync_UIRedrawRequired; mSyncResult |= kSync_UIRedrawRequired;

1
libs/hwui/renderthread/DrawFrameTask.h
View File

@@ -42,6 +42,7 @@ class RenderThread;
enum SyncResult { enum SyncResult {
kSync_OK = 0, kSync_OK = 0,
kSync_UIRedrawRequired = 1 << 0, kSync_UIRedrawRequired = 1 << 0,
kSync_LostSurfaceRewardIfFound = 1 << 1,
}; };
/* /*