ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am a9a1b006: Initialize DisplayData fences to NO_FENCE, not NULL

Browse Source 
* commit 'a9a1b006e48320f5c501473e51e6c4a5f7a17b88':
  Initialize DisplayData fences to NO_FENCE, not NULL
This commit is contained in:
Jesse Hall 2013-02-28 22:37:49 +00:00 committed by Android Git Automerger
commit 21684fc76d
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -1049,5 +1049,21 @@ bool HWComposer::VSyncThread::threadLoop() {
return true;
}
HWComposer::DisplayData::DisplayData()
: width(0), height(0), format(0),
xdpi(0.0f), ydpi(0.0f),
refresh(0),
connected(false),
hasFbComp(false), hasOvComp(false),
capacity(0), list(NULL),
framebufferTarget(NULL), fbTargetHandle(0),
lastRetireFence(Fence::NO_FENCE), lastDisplayFence(Fence::NO_FENCE),
events(0)
{}
HWComposer::DisplayData::~DisplayData() {
free(list);
}
// ---------------------------------------------------------------------------
}; // namespace android

9
services/surfaceflinger/DisplayHardware/HWComposer.h
View File

@ -289,13 +289,8 @@ private:
struct DisplayData {
DisplayData() : xdpi(0), ydpi(0), refresh(0),
connected(false), hasFbComp(false), hasOvComp(false),
capacity(0), list(NULL),
framebufferTarget(NULL), fbTargetHandle(NULL), events(0) { }
~DisplayData() {
free(list);
}
DisplayData();
~DisplayData();
uint32_t width;
uint32_t height;
uint32_t format; // pixel format from FB hal, for pre-hwc-1.1

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -892,7 +892,7 @@ void SurfaceFlinger::postComposition()
const HWComposer& hwc = getHwComposer();
sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);
if (presentFence != NULL) {
if (presentFence->isValid()) {
mAnimFrameTracker.setActualPresentFence(presentFence);
} else {
// The HWC doesn't support present fences, so use the refresh