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

Merge "Skip frames with no damage" into mnc-dev

Browse Source
This commit is contained in:
John Reck
2015-04-29 20:10:25 +00:00
committed by Android (Google) Code Review
parent 05a56db39d 240ff6246a
commit b2cec86a44
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/FrameInfo.h
View File

@@ -53,6 +53,7 @@ enum class FrameInfoFlags {
kWindowLayoutChanged = 1 << 0, kWindowLayoutChanged = 1 << 0,
kRTAnimation = 1 << 1, kRTAnimation = 1 << 1,
kSurfaceCanvas = 1 << 2, kSurfaceCanvas = 1 << 2,
kSkippedFrame = 1 << 3,
}; };
MAKE_FLAGS_ENUM(FrameInfoFlags) MAKE_FLAGS_ENUM(FrameInfoFlags)
@@ -101,6 +102,10 @@ public:
set(FrameInfoIndex::kFrameCompleted) = systemTime(CLOCK_MONOTONIC); set(FrameInfoIndex::kFrameCompleted) = systemTime(CLOCK_MONOTONIC);
} }
void addFlag(FrameInfoFlags flag) {
set(FrameInfoIndex::kFlags) |= static_cast<uint64_t>(flag);
}
int64_t operator[](FrameInfoIndex index) const { int64_t operator[](FrameInfoIndex index) const {
if (index == FrameInfoIndex::kNumIndexes) return 0; if (index == FrameInfoIndex::kNumIndexes) return 0;
return mFrameInfo[static_cast<int>(index)]; return mFrameInfo[static_cast<int>(index)];

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

@@ -27,12 +27,25 @@
#include "../OpenGLRenderer.h" #include "../OpenGLRenderer.h"
#include <algorithm> #include <algorithm>
#include <cutils/properties.h>
#include <private/hwui/DrawGlInfo.h> #include <private/hwui/DrawGlInfo.h>
#include <strings.h> #include <strings.h>
#define TRIM_MEMORY_COMPLETE 80 #define TRIM_MEMORY_COMPLETE 80
#define TRIM_MEMORY_UI_HIDDEN 20 #define TRIM_MEMORY_UI_HIDDEN 20
#define PROPERTY_SKIP_EMPTY_DAMAGE "debug.hwui.skip_empty_damage"
static bool sInitialized = false;
static bool sSkipEmptyDamage = true;
static void initGlobals() {
if (sInitialized) return;
sInitialized = true;
sSkipEmptyDamage = property_get_bool(PROPERTY_SKIP_EMPTY_DAMAGE,
sSkipEmptyDamage);
}
namespace android { namespace android {
namespace uirenderer { namespace uirenderer {
namespace renderthread { namespace renderthread {
@@ -45,6 +58,9 @@ CanvasContext::CanvasContext(RenderThread& thread, bool translucent,
, mAnimationContext(contextFactory->createAnimationContext(mRenderThread.timeLord())) , mAnimationContext(contextFactory->createAnimationContext(mRenderThread.timeLord()))
, mRootRenderNode(rootRenderNode) , mRootRenderNode(rootRenderNode)
, mJankTracker(thread.timeLord().frameIntervalNanos()) { , mJankTracker(thread.timeLord().frameIntervalNanos()) {
// Done lazily at first draw instead of at library load to avoid
// running pre-zygote fork
initGlobals();
mRenderThread.renderState().registerCanvasContext(this); mRenderThread.renderState().registerCanvasContext(this);
mProfiler.setDensity(mRenderThread.mainDisplayInfo().density); mProfiler.setDensity(mRenderThread.mainDisplayInfo().density);
} }
@@ -203,12 +219,17 @@ void CanvasContext::draw() {
LOG_ALWAYS_FATAL_IF(!mCanvas || mEglSurface == EGL_NO_SURFACE, LOG_ALWAYS_FATAL_IF(!mCanvas || mEglSurface == EGL_NO_SURFACE,
"drawRenderNode called on a context with no canvas or surface!"); "drawRenderNode called on a context with no canvas or surface!");
profiler().markPlaybackStart();
mCurrentFrameInfo->markIssueDrawCommandsStart();
SkRect dirty; SkRect dirty;
mDamageAccumulator.finish(&dirty); mDamageAccumulator.finish(&dirty);
if (dirty.isEmpty() && sSkipEmptyDamage) {
mCurrentFrameInfo->addFlag(FrameInfoFlags::kSkippedFrame);
return;
}
profiler().markPlaybackStart();
mCurrentFrameInfo->markIssueDrawCommandsStart();
EGLint width, height; EGLint width, height;
mEglManager.beginFrame(mEglSurface, &width, &height); mEglManager.beginFrame(mEglSurface, &width, &height);
if (width != mCanvas->getViewportWidth() || height != mCanvas->getViewportHeight()) { if (width != mCanvas->getViewportWidth() || height != mCanvas->getViewportHeight()) {
@@ -277,6 +298,8 @@ void CanvasContext::doFrame() {
prepareTree(info, frameInfo); prepareTree(info, frameInfo);
if (info.out.canDrawThisFrame) { if (info.out.canDrawThisFrame) {
draw(); draw();
} else {
mCurrentFrameInfo->addFlag(FrameInfoFlags::kSkippedFrame);
} }
} }