am a9a1b006
: Initialize DisplayData fences to NO_FENCE, not NULL
* commit 'a9a1b006e48320f5c501473e51e6c4a5f7a17b88': Initialize DisplayData fences to NO_FENCE, not NULL
This commit is contained in:
commit
21684fc76d
@ -1049,5 +1049,21 @@ bool HWComposer::VSyncThread::threadLoop() {
|
|||||||
return true;
|
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
|
}; // namespace android
|
||||||
|
@ -289,13 +289,8 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
struct DisplayData {
|
struct DisplayData {
|
||||||
DisplayData() : xdpi(0), ydpi(0), refresh(0),
|
DisplayData();
|
||||||
connected(false), hasFbComp(false), hasOvComp(false),
|
~DisplayData();
|
||||||
capacity(0), list(NULL),
|
|
||||||
framebufferTarget(NULL), fbTargetHandle(NULL), events(0) { }
|
|
||||||
~DisplayData() {
|
|
||||||
free(list);
|
|
||||||
}
|
|
||||||
uint32_t width;
|
uint32_t width;
|
||||||
uint32_t height;
|
uint32_t height;
|
||||||
uint32_t format; // pixel format from FB hal, for pre-hwc-1.1
|
uint32_t format; // pixel format from FB hal, for pre-hwc-1.1
|
||||||
|
@ -892,7 +892,7 @@ void SurfaceFlinger::postComposition()
|
|||||||
|
|
||||||
const HWComposer& hwc = getHwComposer();
|
const HWComposer& hwc = getHwComposer();
|
||||||
sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);
|
sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);
|
||||||
if (presentFence != NULL) {
|
if (presentFence->isValid()) {
|
||||||
mAnimFrameTracker.setActualPresentFence(presentFence);
|
mAnimFrameTracker.setActualPresentFence(presentFence);
|
||||||
} else {
|
} else {
|
||||||
// The HWC doesn't support present fences, so use the refresh
|
// The HWC doesn't support present fences, so use the refresh
|
||||||
|
Loading…
Reference in New Issue
Block a user